diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2010-12-19 07:53:13 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2010-12-19 07:53:13 +0000 |
| commit | 66c6c227f707cf7f932fff685f601c4b1474285a (patch) | |
| tree | 6dfe86c9ed603b5f6d5cb6117ad4646eafbde776 /usr.bin | |
| parent | 4b9d52785c080893e60bc6eb40a3fda878306036 (diff) | |
Remove `i' and `r' macro handlers. These macros, originally part of the
me package, aren't recognised by "groff -mandoc" so we don't need to do
so either. Besides, they are not used in base or Xenocara, and only at
two or three places in one single port, which are probably typos.
From kristaps@.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/mandoc/man.c | 11 | ||||
| -rw-r--r-- | usr.bin/mandoc/man.h | 4 | ||||
| -rw-r--r-- | usr.bin/mandoc/man_html.c | 4 | ||||
| -rw-r--r-- | usr.bin/mandoc/man_macro.c | 4 | ||||
| -rw-r--r-- | usr.bin/mandoc/man_term.c | 4 | ||||
| -rw-r--r-- | usr.bin/mandoc/man_validate.c | 4 |
6 files changed, 10 insertions, 21 deletions
diff --git a/usr.bin/mandoc/man.c b/usr.bin/mandoc/man.c index 8b2621facd8..d60dd1bbab3 100644 --- a/usr.bin/mandoc/man.c +++ b/usr.bin/mandoc/man.c @@ -1,4 +1,4 @@ -/* $Id: man.c,v 1.49 2010/12/07 00:08:52 schwarze Exp $ */ +/* $Id: man.c,v 1.50 2010/12/19 07:53:12 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -36,11 +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", "TS", "TE", "ft", + "RI", "na", "sp", "nf", + "fi", "RE", "RS", "DT", + "UC", "PD", "AT", "in", + "TS", "TE", "ft", }; const char * const *man_macronames = __man_macronames; diff --git a/usr.bin/mandoc/man.h b/usr.bin/mandoc/man.h index e976af6db90..e19c41977ee 100644 --- a/usr.bin/mandoc/man.h +++ b/usr.bin/mandoc/man.h @@ -1,4 +1,4 @@ -/* $Id: man.h,v 1.30 2010/11/29 02:26:45 schwarze Exp $ */ +/* $Id: man.h,v 1.31 2010/12/19 07:53:12 schwarze Exp $ */ /* * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -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/usr.bin/mandoc/man_html.c b/usr.bin/mandoc/man_html.c index 6df5b206064..5c3c07d4418 100644 --- a/usr.bin/mandoc/man_html.c +++ b/usr.bin/mandoc/man_html.c @@ -1,4 +1,4 @@ -/* $Id: man_html.c,v 1.23 2010/12/07 00:06:24 schwarze Exp $ */ +/* $Id: man_html.c,v 1.24 2010/12/19 07:53:12 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -98,11 +98,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/usr.bin/mandoc/man_macro.c b/usr.bin/mandoc/man_macro.c index 6fb329a209c..cb467dd6f2c 100644 --- a/usr.bin/mandoc/man_macro.c +++ b/usr.bin/mandoc/man_macro.c @@ -1,4 +1,4 @@ -/* $Id: man_macro.c,v 1.24 2010/12/01 23:02:59 schwarze Exp $ */ +/* $Id: man_macro.c,v 1.25 2010/12/19 07:53:12 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -65,11 +65,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/usr.bin/mandoc/man_term.c b/usr.bin/mandoc/man_term.c index ddd9bfbb147..195ca7a3320 100644 --- a/usr.bin/mandoc/man_term.c +++ b/usr.bin/mandoc/man_term.c @@ -1,4 +1,4 @@ -/* $Id: man_term.c,v 1.55 2010/12/07 00:08:52 schwarze Exp $ */ +/* $Id: man_term.c,v 1.56 2010/12/19 07:53:12 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org> @@ -125,11 +125,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/usr.bin/mandoc/man_validate.c b/usr.bin/mandoc/man_validate.c index 43820d75b19..776d1ac1d64 100644 --- a/usr.bin/mandoc/man_validate.c +++ b/usr.bin/mandoc/man_validate.c @@ -1,4 +1,4 @@ -/* $Id: man_validate.c,v 1.36 2010/12/07 00:08:52 schwarze Exp $ */ +/* $Id: man_validate.c,v 1.37 2010/12/19 07:53:12 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org> @@ -101,11 +101,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 */ |