From 45ec86af0876cfb3fe26e9d6545dd7fe008b81f0 Mon Sep 17 00:00:00 2001
From: Kristaps Dzonsons <kristaps@bsd.lv>
Date: Sat, 15 May 2010 20:51:40 +0000
Subject: Pull `ig' out of -man and leave it the roff preparser.

---
 man.c          |  3 +--
 man.h          |  1 -
 man_action.c   |  1 -
 man_html.c     |  1 -
 man_macro.c    |  4 +---
 man_term.c     |  1 -
 man_validate.c |  4 +---
 roff.c         | 10 ----------
 8 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/man.c b/man.c
index 20c3d1d1..66882580 100644
--- a/man.c
+++ b/man.c
@@ -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;
diff --git a/man.h b/man.h
index 944003a5..c9c0b3d1 100644
--- a/man.h
+++ b/man.h
@@ -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 abd9cc62..befdab37 100644
--- a/man_action.c
+++ b/man_action.c
@@ -74,7 +74,6 @@ const	struct actions man_actions[MAN_MAX] = {
 	{ post_de }, /* dei */
 	{ post_de }, /* am */
 	{ post_de }, /* ami */
-	{ post_de }, /* ig */
 	{ NULL }, /* . */
 };
 
diff --git a/man_html.c b/man_html.c
index 22e022e7..b8a66ea2 100644
--- a/man_html.c
+++ b/man_html.c
@@ -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 550d162f..cc5d7b86 100644
--- a/man_macro.c
+++ b/man_macro.c
@@ -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;
 		}
diff --git a/man_term.c b/man_term.c
index e41a8ea4..52d67e88 100644
--- a/man_term.c
+++ b/man_term.c
@@ -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 a7b21167..fefc4fdd 100644
--- a/man_validate.c
+++ b/man_validate.c
@@ -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);
diff --git a/roff.c b/roff.c
index 0db87efa..0782fd8f 100644
--- a/roff.c
+++ b/roff.c
@@ -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);
 }
 
 
-- 
cgit