===================================================================
RCS file: /cvs/mandoc/roff.c,v
retrieving revision 1.101
retrieving revision 1.104
diff -u -p -r1.101 -r1.104
--- mandoc/roff.c	2010/09/04 18:31:44	1.101
+++ mandoc/roff.c	2010/12/01 10:31:35	1.104
@@ -1,4 +1,4 @@
-/*	$Id: roff.c,v 1.101 2010/09/04 18:31:44 kristaps Exp $ */
+/*	$Id: roff.c,v 1.104 2010/12/01 10:31:35 kristaps Exp $ */
 /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -45,6 +45,7 @@
 #endif
 
 enum	rofft {
+	ROFF_ad,
 	ROFF_am,
 	ROFF_ami,
 	ROFF_am1,
@@ -53,14 +54,17 @@ enum	rofft {
 	ROFF_de1,
 	ROFF_ds,
 	ROFF_el,
+	ROFF_hy,
 	ROFF_ie,
 	ROFF_if,
 	ROFF_ig,
+	ROFF_ne,
+	ROFF_nh,
+	ROFF_nr,
 	ROFF_rm,
 	ROFF_tr,
 	ROFF_cblock,
 	ROFF_ccond, /* FIXME: remove this. */
-	ROFF_nr,
 	ROFF_MAX
 };
 
@@ -130,7 +134,8 @@ static	enum roffrule	 roff_evalcond(const char *, int 
 static	void		 roff_freestr(struct roff *);
 static	const char	*roff_getstrn(const struct roff *, 
 				const char *, size_t);
-static	enum rofferr	 roff_line(ROFF_ARGS);
+static	enum rofferr	 roff_line_ignore(ROFF_ARGS);
+static	enum rofferr	 roff_line_error(ROFF_ARGS);
 static	enum rofferr	 roff_nr(ROFF_ARGS);
 static	int		 roff_res(struct roff *, 
 				char **, size_t *, int);
@@ -147,6 +152,7 @@ static	char		*roff_strdup(const char *);
 static	struct roffmac	*hash[HASHWIDTH];
 
 static	struct roffmac	 roffs[ROFF_MAX] = {
+	{ "ad", roff_line_ignore, NULL, NULL, 0, NULL },
 	{ "am", roff_block, roff_block_text, roff_block_sub, 0, NULL },
 	{ "ami", roff_block, roff_block_text, roff_block_sub, 0, NULL },
 	{ "am1", roff_block, roff_block_text, roff_block_sub, 0, NULL },
@@ -155,14 +161,17 @@ static	struct roffmac	 roffs[ROFF_MAX] = {
 	{ "de1", roff_block, roff_block_text, roff_block_sub, 0, NULL },
 	{ "ds", roff_ds, NULL, NULL, 0, NULL },
 	{ "el", roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT, NULL },
+	{ "hy", roff_line_ignore, NULL, NULL, 0, NULL },
 	{ "ie", roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT, NULL },
 	{ "if", roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT, NULL },
 	{ "ig", roff_block, roff_block_text, roff_block_sub, 0, NULL },
-	{ "rm", roff_line, NULL, NULL, 0, NULL },
-	{ "tr", roff_line, NULL, NULL, 0, NULL },
+	{ "ne", roff_line_ignore, NULL, NULL, 0, NULL },
+	{ "nh", roff_line_ignore, NULL, NULL, 0, NULL },
+	{ "nr", roff_nr, NULL, NULL, 0, NULL },
+	{ "rm", roff_line_error, NULL, NULL, 0, NULL },
+	{ "tr", roff_line_ignore, NULL, NULL, 0, NULL },
 	{ ".", roff_cblock, NULL, NULL, 0, NULL },
 	{ "\\}", roff_ccond, NULL, NULL, 0, NULL },
-	{ "nr", roff_nr, NULL, NULL, 0, NULL },
 };
 
 static	void		 roff_free1(struct roff *);
@@ -749,7 +758,6 @@ roff_cond_sub(ROFF_ARGS)
 {
 	enum rofft	 t;
 	enum roffrule	 rr;
-	struct roffnode	*l;
 
 	ppos = pos;
 	rr = r->last->rule;
@@ -759,7 +767,6 @@ roff_cond_sub(ROFF_ARGS)
 	 * continue. 
 	 */
 
-	l = r->last;
 	roffnode_cleanscope(r);
 
 	if (ROFF_MAX == (t = roff_parse(*bufp, &pos))) {
@@ -840,15 +847,22 @@ roff_evalcond(const char *v, int *pos)
 	return(ROFFRULE_DENY);
 }
 
-
 /* ARGSUSED */
 static enum rofferr
-roff_line(ROFF_ARGS)
+roff_line_ignore(ROFF_ARGS)
 {
 
 	return(ROFF_IGN);
 }
 
+/* ARGSUSED */
+static enum rofferr
+roff_line_error(ROFF_ARGS)
+{
+
+	(*r->msg)(MANDOCERR_REQUEST, r->data, ln, ppos, roffs[tok].name);
+	return(ROFF_IGN);
+}
 
 /* ARGSUSED */
 static enum rofferr