summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--man.745
-rw-r--r--man.c8
-rw-r--r--man.h2
-rw-r--r--man_html.c2
-rw-r--r--man_macro.c2
-rw-r--r--man_term.c2
-rw-r--r--man_validate.c2
7 files changed, 10 insertions, 53 deletions
diff --git a/man.7 b/man.7
index 13dd0c32..afcc4dc7 100644
--- a/man.7
+++ b/man.7
@@ -424,11 +424,9 @@ The syntax is as follows:
.It Sx \&br Ta 0 Ta current Ta compat
.It Sx \&fi Ta 0 Ta current Ta compat
.It Sx \&ft Ta 1 Ta current Ta compat
-.It Sx \&i Ta n Ta current Ta compat
.It Sx \&in Ta 1 Ta current Ta compat
.It Sx \&na Ta 0 Ta current Ta compat
.It Sx \&nf Ta 0 Ta current Ta compat
-.It Sx \&r Ta 0 Ta current Ta compat
.It Sx \&sp Ta 1 Ta current Ta compat
.El
.Pp
@@ -509,12 +507,9 @@ The optional arguments specify which release it is from.
Text is rendered in bold face.
.Pp
See also
-.Sx \&I ,
-.Sx \&R ,
-.Sx \&b ,
-.Sx \&i ,
+.Sx \&I
and
-.Sx \&r .
+.Sx \&R .
.Ss \&BI
Text is rendered alternately in bold face and italic.
Thus,
@@ -591,12 +586,9 @@ and
Text is rendered in italics.
.Pp
See also
-.Sx \&B ,
-.Sx \&R ,
-.Sx \&b ,
-.Sx \&i ,
+.Sx \&B
and
-.Sx \&r .
+.Sx \&R .
.Ss \&IB
Text is rendered alternately in italics and bold face.
Whitespace between arguments is omitted in output.
@@ -692,12 +684,9 @@ and
Text is rendered in roman (the default font).
.Pp
See also
-.Sx \&I ,
-.Sx \&B ,
-.Sx \&b ,
-.Sx \&i ,
+.Sx \&I
and
-.Sx \&r .
+.Sx \&B .
.Ss \&RB
Text is rendered alternately in roman (the default font) and bold face.
Whitespace between arguments is omitted in output.
@@ -836,18 +825,6 @@ Change the current font mode.
See
.Sx Text Decoration
for a listing of available font modes.
-.Ss \&i
-Italicise arguments.
-Synonym for
-.Sx \&I .
-.Pp
-See also
-.Sx \&B ,
-.Sx \&I ,
-.Sx \&R .
-.Sx \&b ,
-and
-.Sx \&r .
.Ss \&in
Indent relative to the current indentation:
.Pp
@@ -865,16 +842,6 @@ Begin literal mode: all subsequent free-form lines have their end of
line boundaries preserved.
May be ended by
.Sx \&fi .
-.Ss \&r
-Fonts and styles (bold face, italics) reset to roman (default font).
-.Pp
-See also
-.Sx \&B ,
-.Sx \&I ,
-.Sx \&R ,
-.Sx \&b ,
-and
-.Sx \&i .
.Ss \&sp
Insert vertical spaces into output with the following syntax:
.Bd -filled -offset indent
diff --git a/man.c b/man.c
index 8a9fbb7f..d8b478de 100644
--- a/man.c
+++ b/man.c
@@ -36,10 +36,10 @@ const char *const __man_macronames[MAN_MAX] = {
"IP", "HP", "SM", "SB",
"BI", "IB", "BR", "RB",
"R", "B", "I", "IR",
- "RI", "na", "i", "sp",
- "nf", "fi", "r", "RE",
- "RS", "DT", "UC", "PD",
- "AT", "in", "ft"
+ "RI", "na", "sp", "nf",
+ "fi", "RE", "RS", "DT",
+ "UC", "PD", "AT", "in",
+ "ft"
};
const char * const *man_macronames = __man_macronames;
diff --git a/man.h b/man.h
index 4d26a437..81b2792e 100644
--- a/man.h
+++ b/man.h
@@ -43,11 +43,9 @@ enum mant {
MAN_IR,
MAN_RI,
MAN_na,
- MAN_i,
MAN_sp,
MAN_nf,
MAN_fi,
- MAN_r,
MAN_RE,
MAN_RS,
MAN_DT,
diff --git a/man_html.c b/man_html.c
index 57af4887..5e0959f4 100644
--- a/man_html.c
+++ b/man_html.c
@@ -102,11 +102,9 @@ static const struct htmlman mans[MAN_MAX] = {
{ man_alt_pre, NULL }, /* IR */
{ man_alt_pre, NULL }, /* RI */
{ NULL, NULL }, /* na */
- { NULL, NULL }, /* i */
{ man_br_pre, NULL }, /* sp */
{ man_literal_pre, NULL }, /* nf */
{ man_literal_pre, NULL }, /* fi */
- { NULL, NULL }, /* r */
{ NULL, NULL }, /* RE */
{ man_RS_pre, NULL }, /* RS */
{ man_ign_pre, NULL }, /* DT */
diff --git a/man_macro.c b/man_macro.c
index 63ba5b84..5a5d2366 100644
--- a/man_macro.c
+++ b/man_macro.c
@@ -69,11 +69,9 @@ const struct man_macro __man_macros[MAN_MAX] = {
{ in_line_eoln, 0 }, /* IR */
{ in_line_eoln, 0 }, /* RI */
{ in_line_eoln, MAN_NSCOPED }, /* na */
- { in_line_eoln, 0 }, /* i */
{ in_line_eoln, MAN_NSCOPED }, /* sp */
{ in_line_eoln, 0 }, /* nf */
{ in_line_eoln, 0 }, /* fi */
- { in_line_eoln, 0 }, /* r */
{ blk_close, 0 }, /* RE */
{ blk_exp, MAN_EXPLICIT }, /* RS */
{ in_line_eoln, 0 }, /* DT */
diff --git a/man_term.c b/man_term.c
index cbf5d1e1..5a0f67b4 100644
--- a/man_term.c
+++ b/man_term.c
@@ -126,11 +126,9 @@ static const struct termact termacts[MAN_MAX] = {
{ pre_alternate, NULL, 0 }, /* IR */
{ pre_alternate, NULL, 0 }, /* RI */
{ NULL, NULL, MAN_NOTEXT }, /* na */
- { pre_I, NULL, 0 }, /* i */
{ pre_sp, NULL, MAN_NOTEXT }, /* sp */
{ pre_literal, NULL, 0 }, /* nf */
{ pre_literal, NULL, 0 }, /* fi */
- { NULL, NULL, 0 }, /* r */
{ NULL, NULL, 0 }, /* RE */
{ pre_RS, post_RS, 0 }, /* RS */
{ pre_ign, NULL, 0 }, /* DT */
diff --git a/man_validate.c b/man_validate.c
index d14ea464..a7dcac7c 100644
--- a/man_validate.c
+++ b/man_validate.c
@@ -98,11 +98,9 @@ static const struct man_valid man_valids[MAN_MAX] = {
{ NULL, NULL }, /* IR */
{ NULL, NULL }, /* RI */
{ NULL, posts_eq0 }, /* na */ /* FIXME: should warn only. */
- { NULL, NULL }, /* i */
{ NULL, posts_le1 }, /* sp */ /* FIXME: should warn only. */
{ pres_bline, posts_nf }, /* nf */
{ pres_bline, posts_fi }, /* fi */
- { NULL, NULL }, /* r */
{ NULL, NULL }, /* RE */
{ NULL, posts_part }, /* RS */
{ NULL, NULL }, /* DT */