diff options
-rw-r--r-- | man.c | 5 | ||||
-rw-r--r-- | man.h | 3 | ||||
-rw-r--r-- | man_action.c | 3 | ||||
-rw-r--r-- | man_html.c | 3 | ||||
-rw-r--r-- | man_macro.c | 6 | ||||
-rw-r--r-- | man_term.c | 3 | ||||
-rw-r--r-- | man_validate.c | 6 | ||||
-rw-r--r-- | roff.c | 12 |
8 files changed, 11 insertions, 30 deletions
@@ -1,4 +1,4 @@ -/* $Id: man.c,v 1.68 2010/05/15 15:54:39 kristaps Exp $ */ +/* $Id: man.c,v 1.69 2010/05/15 20:51:40 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -65,8 +65,7 @@ const char *const __man_macronames[MAN_MAX] = { "nf", "fi", "r", "RE", "RS", "DT", "UC", "PD", "Sp", "Vb", "Ve", "de", - "dei", "am", "ami", "ig", - ".", + "dei", "am", "ami", ".", }; const char * const *man_macronames = __man_macronames; @@ -1,4 +1,4 @@ -/* $Id: man.h,v 1.30 2010/05/15 15:54:39 kristaps Exp $ */ +/* $Id: man.h,v 1.31 2010/05/15 20:51:40 kristaps Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -59,7 +59,6 @@ enum mant { MAN_dei, MAN_am, MAN_ami, - MAN_ig, MAN_dot, MAN_MAX }; diff --git a/man_action.c b/man_action.c index 2425c13a..9bfe9b46 100644 --- a/man_action.c +++ b/man_action.c @@ -1,4 +1,4 @@ -/* $Id: man_action.c,v 1.32 2010/05/15 16:27:23 kristaps Exp $ */ +/* $Id: man_action.c,v 1.33 2010/05/15 20:51:40 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -74,7 +74,6 @@ const struct actions man_actions[MAN_MAX] = { { post_de }, /* dei */ { post_de }, /* am */ { post_de }, /* ami */ - { post_de }, /* ig */ { NULL }, /* . */ }; @@ -1,4 +1,4 @@ -/* $Id: man_html.c,v 1.31 2010/05/15 15:54:39 kristaps Exp $ */ +/* $Id: man_html.c,v 1.32 2010/05/15 20:51:40 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -110,7 +110,6 @@ static const struct htmlman mans[MAN_MAX] = { { man_ign_pre, NULL }, /* dei */ { man_ign_pre, NULL }, /* am */ { man_ign_pre, NULL }, /* ami */ - { man_ign_pre, NULL }, /* ig */ { NULL, NULL }, /* . */ }; diff --git a/man_macro.c b/man_macro.c index 37534e09..012d4163 100644 --- a/man_macro.c +++ b/man_macro.c @@ -1,4 +1,4 @@ -/* $Id: man_macro.c,v 1.42 2010/03/29 10:10:35 kristaps Exp $ */ +/* $Id: man_macro.c,v 1.43 2010/05/15 20:51:40 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -86,7 +86,6 @@ const struct man_macro __man_macros[MAN_MAX] = { { blk_exp, MAN_EXPLICIT | MAN_NOCLOSE}, /* dei */ { blk_exp, MAN_EXPLICIT | MAN_NOCLOSE}, /* am */ { blk_exp, MAN_EXPLICIT | MAN_NOCLOSE}, /* ami */ - { blk_exp, MAN_EXPLICIT | MAN_NOCLOSE}, /* ig */ { blk_dotted, 0 }, /* . */ }; @@ -297,8 +296,7 @@ blk_dotted(MACRO_PROT_ARGS) for (nn = m->last->parent; nn; nn = nn->parent) if (nn->tok == MAN_de || nn->tok == MAN_dei || nn->tok == MAN_am || - nn->tok == MAN_ami || - nn->tok == MAN_ig) { + nn->tok == MAN_ami) { ntok = nn->tok; break; } @@ -1,4 +1,4 @@ -/* $Id: man_term.c,v 1.66 2010/05/15 17:25:21 joerg Exp $ */ +/* $Id: man_term.c,v 1.67 2010/05/15 20:51:40 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -146,7 +146,6 @@ static const struct termact termacts[MAN_MAX] = { { pre_ign, NULL, MAN_NOTEXT }, /* dei */ { pre_ign, NULL, MAN_NOTEXT }, /* am */ { pre_ign, NULL, MAN_NOTEXT }, /* ami */ - { pre_ign, NULL, MAN_NOTEXT }, /* ig */ { NULL, NULL, 0 }, /* . */ }; diff --git a/man_validate.c b/man_validate.c index ca920646..bfce2287 100644 --- a/man_validate.c +++ b/man_validate.c @@ -1,4 +1,4 @@ -/* $Id: man_validate.c,v 1.37 2010/05/15 15:54:39 kristaps Exp $ */ +/* $Id: man_validate.c,v 1.38 2010/05/15 20:51:40 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -101,7 +101,6 @@ static const struct man_valid man_valids[MAN_MAX] = { { pres_roff, NULL }, /* dei */ { pres_roff, NULL }, /* am */ { pres_roff, NULL }, /* ami */ - { pres_roff, NULL }, /* ig */ { NULL, NULL }, /* . */ }; @@ -335,8 +334,7 @@ check_roff(CHKARGS) for (n = n->parent; n; n = n->parent) if (MAN_de == n->tok || MAN_dei == n->tok || MAN_am == n->tok || - MAN_ami == n->tok || - MAN_ig == n->tok) + MAN_ami == n->tok) return(man_nerr(m, n, WROFFNEST)); return(1); @@ -1,4 +1,4 @@ -/* $Id: roff.c,v 1.69 2010/05/15 18:48:32 kristaps Exp $ */ +/* $Id: roff.c,v 1.70 2010/05/15 20:51:40 kristaps Exp $ */ /* * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -76,7 +76,6 @@ const struct roffmac roffs[ROFF_MAX] = { { ".", NULL, roff_new_close }, }; -static void roff_alloc1(struct roff *); static void roff_free1(struct roff *); static enum rofft roff_hash_find(const char *); static int roffnode_push(struct roff *, @@ -153,20 +152,11 @@ roff_free1(struct roff *r) } -static void -roff_alloc1(struct roff *r) -{ - - /* Do nothing for now. */ -} - - void roff_reset(struct roff *r) { roff_free1(r); - roff_alloc1(r); } |