===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_validate.c,v
retrieving revision 1.279
retrieving revision 1.280
diff -c -r1.279 -r1.280
*** src/usr.bin/mandoc/mdoc_validate.c	2018/12/04 02:53:45	1.279
--- src/usr.bin/mandoc/mdoc_validate.c	2018/12/14 05:17:45	1.280
***************
*** 1,4 ****
! /*	$OpenBSD: mdoc_validate.c,v 1.279 2018/12/04 02:53:45 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2018 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: mdoc_validate.c,v 1.280 2018/12/14 05:17:45 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2018 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 413,420 ****
  		return;
  
  	for (cp = p; NULL != (p = strchr(p, '\t')); p++)
! 		mandoc_msg(MANDOCERR_FI_TAB, mdoc->parse,
! 		    ln, pos + (int)(p - cp), NULL);
  }
  
  static void
--- 413,419 ----
  		return;
  
  	for (cp = p; NULL != (p = strchr(p, '\t')); p++)
! 		mandoc_msg(MANDOCERR_FI_TAB, ln, pos + (int)(p - cp), NULL);
  }
  
  static void
***************
*** 461,467 ****
  		     nn != NULL &&
  		     nn->type == ROFFT_TEXT &&
  		     isalpha((unsigned char)*nn->string))) {
! 			mandoc_msg(MANDOCERR_DASHDASH, mdoc->parse,
  			    ln, pos + (int)(cp - p) - 1, NULL);
  			break;
  		}
--- 460,466 ----
  		     nn != NULL &&
  		     nn->type == ROFFT_TEXT &&
  		     isalpha((unsigned char)*nn->string))) {
! 			mandoc_msg(MANDOCERR_DASHDASH,
  			    ln, pos + (int)(cp - p) - 1, NULL);
  			break;
  		}
***************
*** 477,493 ****
  		return;
  
  	if ((cp = strstr(p, "OpenBSD")) != NULL)
! 		mandoc_msg(MANDOCERR_BX, mdoc->parse,
! 		    ln, pos + (cp - p), "Ox");
  	if ((cp = strstr(p, "NetBSD")) != NULL)
! 		mandoc_msg(MANDOCERR_BX, mdoc->parse,
! 		    ln, pos + (cp - p), "Nx");
  	if ((cp = strstr(p, "FreeBSD")) != NULL)
! 		mandoc_msg(MANDOCERR_BX, mdoc->parse,
! 		    ln, pos + (cp - p), "Fx");
  	if ((cp = strstr(p, "DragonFly")) != NULL)
! 		mandoc_msg(MANDOCERR_BX, mdoc->parse,
! 		    ln, pos + (cp - p), "Dx");
  
  	cp = p;
  	while ((cp = strstr(cp + 1, "()")) != NULL) {
--- 476,488 ----
  		return;
  
  	if ((cp = strstr(p, "OpenBSD")) != NULL)
! 		mandoc_msg(MANDOCERR_BX, ln, pos + (int)(cp - p), "Ox");
  	if ((cp = strstr(p, "NetBSD")) != NULL)
! 		mandoc_msg(MANDOCERR_BX, ln, pos + (int)(cp - p), "Nx");
  	if ((cp = strstr(p, "FreeBSD")) != NULL)
! 		mandoc_msg(MANDOCERR_BX, ln, pos + (int)(cp - p), "Fx");
  	if ((cp = strstr(p, "DragonFly")) != NULL)
! 		mandoc_msg(MANDOCERR_BX, ln, pos + (int)(cp - p), "Dx");
  
  	cp = p;
  	while ((cp = strstr(cp + 1, "()")) != NULL) {
***************
*** 496,503 ****
  				break;
  		if ((cpr < p || *cpr == ' ') && cpr + 1 < cp) {
  			cpr++;
! 			mandoc_vmsg(MANDOCERR_FUNC, mdoc->parse,
! 			    ln, pos + (cpr - p),
  			    "%.*s()", (int)(cp - cpr), cpr);
  		}
  	}
--- 491,497 ----
  				break;
  		if ((cpr < p || *cpr == ' ') && cpr + 1 < cp) {
  			cpr++;
! 			mandoc_msg(MANDOCERR_FUNC, ln, pos + (int)(cpr - p),
  			    "%.*s()", (int)(cp - cpr), cpr);
  		}
  	}
***************
*** 531,539 ****
  	    tok == MDOC_Ss || tok == MDOC_Fo))
  		return;
  
! 	mandoc_vmsg(MANDOCERR_DELIM, mdoc->parse,
! 	    nch->line, nch->pos + (lc - nch->string),
! 	    "%s%s %s", roff_name[tok],
  	    nch == mdoc->last->child ? "" : " ...", nch->string);
  }
  
--- 525,532 ----
  	    tok == MDOC_Ss || tok == MDOC_Fo))
  		return;
  
! 	mandoc_msg(MANDOCERR_DELIM, nch->line,
! 	    nch->pos + (int)(lc - nch->string), "%s%s %s", roff_name[tok],
  	    nch == mdoc->last->child ? "" : " ...", nch->string);
  }
  
***************
*** 625,633 ****
  		}
  	}
  
! 	mandoc_vmsg(MANDOCERR_DELIM_NB, mdoc->parse,
! 	    nch->line, nch->pos + (lc - nch->string),
! 	    "%s%s %s", roff_name[tok],
  	    nch == mdoc->last->child ? "" : " ...", nch->string);
  }
  
--- 618,625 ----
  		}
  	}
  
! 	mandoc_msg(MANDOCERR_DELIM_NB, nch->line,
! 	    nch->pos + (int)(lc - nch->string), "%s%s %s", roff_name[tok],
  	    nch == mdoc->last->child ? "" : " ...", nch->string);
  }
  
***************
*** 693,731 ****
  		case MDOC_Compact:
  			if (n->norm->Bl.comp)
  				mandoc_msg(MANDOCERR_ARG_REP,
! 				    mdoc->parse, argv->line,
! 				    argv->pos, "Bl -compact");
  			n->norm->Bl.comp = 1;
  			break;
  		case MDOC_Width:
  			wa = argv;
  			if (0 == argv->sz) {
  				mandoc_msg(MANDOCERR_ARG_EMPTY,
! 				    mdoc->parse, argv->line,
! 				    argv->pos, "Bl -width");
  				n->norm->Bl.width = "0n";
  				break;
  			}
  			if (NULL != n->norm->Bl.width)
! 				mandoc_vmsg(MANDOCERR_ARG_REP,
! 				    mdoc->parse, argv->line,
! 				    argv->pos, "Bl -width %s",
! 				    argv->value[0]);
  			rewrite_macro2len(mdoc, argv->value);
  			n->norm->Bl.width = argv->value[0];
  			break;
  		case MDOC_Offset:
  			if (0 == argv->sz) {
  				mandoc_msg(MANDOCERR_ARG_EMPTY,
! 				    mdoc->parse, argv->line,
! 				    argv->pos, "Bl -offset");
  				break;
  			}
  			if (NULL != n->norm->Bl.offs)
! 				mandoc_vmsg(MANDOCERR_ARG_REP,
! 				    mdoc->parse, argv->line,
! 				    argv->pos, "Bl -offset %s",
! 				    argv->value[0]);
  			rewrite_macro2len(mdoc, argv->value);
  			n->norm->Bl.offs = argv->value[0];
  			break;
--- 685,718 ----
  		case MDOC_Compact:
  			if (n->norm->Bl.comp)
  				mandoc_msg(MANDOCERR_ARG_REP,
! 				    argv->line, argv->pos, "Bl -compact");
  			n->norm->Bl.comp = 1;
  			break;
  		case MDOC_Width:
  			wa = argv;
  			if (0 == argv->sz) {
  				mandoc_msg(MANDOCERR_ARG_EMPTY,
! 				    argv->line, argv->pos, "Bl -width");
  				n->norm->Bl.width = "0n";
  				break;
  			}
  			if (NULL != n->norm->Bl.width)
! 				mandoc_msg(MANDOCERR_ARG_REP,
! 				    argv->line, argv->pos,
! 				    "Bl -width %s", argv->value[0]);
  			rewrite_macro2len(mdoc, argv->value);
  			n->norm->Bl.width = argv->value[0];
  			break;
  		case MDOC_Offset:
  			if (0 == argv->sz) {
  				mandoc_msg(MANDOCERR_ARG_EMPTY,
! 				    argv->line, argv->pos, "Bl -offset");
  				break;
  			}
  			if (NULL != n->norm->Bl.offs)
! 				mandoc_msg(MANDOCERR_ARG_REP,
! 				    argv->line, argv->pos,
! 				    "Bl -offset %s", argv->value[0]);
  			rewrite_macro2len(mdoc, argv->value);
  			n->norm->Bl.offs = argv->value[0];
  			break;
***************
*** 739,746 ****
  		/* Check: multiple list types. */
  
  		if (LIST__NONE != n->norm->Bl.type) {
! 			mandoc_vmsg(MANDOCERR_BL_REP,
! 			    mdoc->parse, n->line, n->pos,
  			    "Bl -%s", mdoc_argnames[argv->arg]);
  			continue;
  		}
--- 726,732 ----
  		/* Check: multiple list types. */
  
  		if (LIST__NONE != n->norm->Bl.type) {
! 			mandoc_msg(MANDOCERR_BL_REP, n->line, n->pos,
  			    "Bl -%s", mdoc_argnames[argv->arg]);
  			continue;
  		}
***************
*** 750,757 ****
  		if (n->norm->Bl.width ||
  		    n->norm->Bl.offs ||
  		    n->norm->Bl.comp)
! 			mandoc_vmsg(MANDOCERR_BL_LATETYPE,
! 			    mdoc->parse, n->line, n->pos, "Bl -%s",
  			    mdoc_argnames[n->args->argv[0].arg]);
  
  		n->norm->Bl.type = lt;
--- 736,743 ----
  		if (n->norm->Bl.width ||
  		    n->norm->Bl.offs ||
  		    n->norm->Bl.comp)
! 			mandoc_msg(MANDOCERR_BL_LATETYPE,
! 			    n->line, n->pos, "Bl -%s",
  			    mdoc_argnames[n->args->argv[0].arg]);
  
  		n->norm->Bl.type = lt;
***************
*** 764,771 ****
  	/* Allow lists to default to LIST_item. */
  
  	if (LIST__NONE == n->norm->Bl.type) {
! 		mandoc_msg(MANDOCERR_BL_NOTYPE, mdoc->parse,
! 		    n->line, n->pos, "Bl");
  		n->norm->Bl.type = LIST_item;
  		mdoclt = MDOC_Item;
  	}
--- 750,756 ----
  	/* Allow lists to default to LIST_item. */
  
  	if (LIST__NONE == n->norm->Bl.type) {
! 		mandoc_msg(MANDOCERR_BL_NOTYPE, n->line, n->pos, "Bl");
  		n->norm->Bl.type = LIST_item;
  		mdoclt = MDOC_Item;
  	}
***************
*** 780,786 ****
  	switch (n->norm->Bl.type) {
  	case LIST_tag:
  		if (n->norm->Bl.width == NULL)
! 			mandoc_msg(MANDOCERR_BL_NOWIDTH, mdoc->parse,
  			    n->line, n->pos, "Bl -tag");
  		break;
  	case LIST_column:
--- 765,771 ----
  	switch (n->norm->Bl.type) {
  	case LIST_tag:
  		if (n->norm->Bl.width == NULL)
! 			mandoc_msg(MANDOCERR_BL_NOWIDTH,
  			    n->line, n->pos, "Bl -tag");
  		break;
  	case LIST_column:
***************
*** 789,797 ****
  	case LIST_inset:
  	case LIST_item:
  		if (n->norm->Bl.width != NULL)
! 			mandoc_vmsg(MANDOCERR_BL_SKIPW, mdoc->parse,
! 			    wa->line, wa->pos, "Bl -%s",
! 			    mdoc_argnames[mdoclt]);
  		n->norm->Bl.width = NULL;
  		break;
  	case LIST_bullet:
--- 774,781 ----
  	case LIST_inset:
  	case LIST_item:
  		if (n->norm->Bl.width != NULL)
! 			mandoc_msg(MANDOCERR_BL_SKIPW, wa->line, wa->pos,
! 			    "Bl -%s", mdoc_argnames[mdoclt]);
  		n->norm->Bl.width = NULL;
  		break;
  	case LIST_bullet:
***************
*** 839,867 ****
  			dt = DISP_literal;
  			break;
  		case MDOC_File:
! 			mandoc_msg(MANDOCERR_BD_FILE, mdoc->parse,
! 			    n->line, n->pos, NULL);
  			break;
  		case MDOC_Offset:
  			if (0 == argv->sz) {
  				mandoc_msg(MANDOCERR_ARG_EMPTY,
! 				    mdoc->parse, argv->line,
! 				    argv->pos, "Bd -offset");
  				break;
  			}
  			if (NULL != n->norm->Bd.offs)
! 				mandoc_vmsg(MANDOCERR_ARG_REP,
! 				    mdoc->parse, argv->line,
! 				    argv->pos, "Bd -offset %s",
! 				    argv->value[0]);
  			rewrite_macro2len(mdoc, argv->value);
  			n->norm->Bd.offs = argv->value[0];
  			break;
  		case MDOC_Compact:
  			if (n->norm->Bd.comp)
  				mandoc_msg(MANDOCERR_ARG_REP,
! 				    mdoc->parse, argv->line,
! 				    argv->pos, "Bd -compact");
  			n->norm->Bd.comp = 1;
  			break;
  		default:
--- 823,847 ----
  			dt = DISP_literal;
  			break;
  		case MDOC_File:
! 			mandoc_msg(MANDOCERR_BD_FILE, n->line, n->pos, NULL);
  			break;
  		case MDOC_Offset:
  			if (0 == argv->sz) {
  				mandoc_msg(MANDOCERR_ARG_EMPTY,
! 				    argv->line, argv->pos, "Bd -offset");
  				break;
  			}
  			if (NULL != n->norm->Bd.offs)
! 				mandoc_msg(MANDOCERR_ARG_REP,
! 				    argv->line, argv->pos,
! 				    "Bd -offset %s", argv->value[0]);
  			rewrite_macro2len(mdoc, argv->value);
  			n->norm->Bd.offs = argv->value[0];
  			break;
  		case MDOC_Compact:
  			if (n->norm->Bd.comp)
  				mandoc_msg(MANDOCERR_ARG_REP,
! 				    argv->line, argv->pos, "Bd -compact");
  			n->norm->Bd.comp = 1;
  			break;
  		default:
***************
*** 873,886 ****
  		if (DISP__NONE == n->norm->Bd.type)
  			n->norm->Bd.type = dt;
  		else
! 			mandoc_vmsg(MANDOCERR_BD_REP,
! 			    mdoc->parse, n->line, n->pos,
  			    "Bd -%s", mdoc_argnames[argv->arg]);
  	}
  
  	if (DISP__NONE == n->norm->Bd.type) {
! 		mandoc_msg(MANDOCERR_BD_NOTYPE, mdoc->parse,
! 		    n->line, n->pos, "Bd");
  		n->norm->Bd.type = DISP_ragged;
  	}
  }
--- 853,864 ----
  		if (DISP__NONE == n->norm->Bd.type)
  			n->norm->Bd.type = dt;
  		else
! 			mandoc_msg(MANDOCERR_BD_REP, n->line, n->pos,
  			    "Bd -%s", mdoc_argnames[argv->arg]);
  	}
  
  	if (DISP__NONE == n->norm->Bd.type) {
! 		mandoc_msg(MANDOCERR_BD_NOTYPE, n->line, n->pos, "Bd");
  		n->norm->Bd.type = DISP_ragged;
  	}
  }
***************
*** 902,909 ****
  
  	for (i = 1; i < n->args->argc; i++) {
  		argv = n->args->argv + i;
! 		mandoc_vmsg(MANDOCERR_AN_REP,
! 		    mdoc->parse, argv->line, argv->pos,
  		    "An -%s", mdoc_argnames[argv->arg]);
  	}
  
--- 880,886 ----
  
  	for (i = 1; i < n->args->argc; i++) {
  		argv = n->args->argv + i;
! 		mandoc_msg(MANDOCERR_AN_REP, argv->line, argv->pos,
  		    "An -%s", mdoc_argnames[argv->arg]);
  	}
  
***************
*** 924,930 ****
  	post_useless(mdoc);
  	n = mdoc->last;
  	if (n->child != NULL)
! 		mandoc_vmsg(MANDOCERR_ARG_SKIP, mdoc->parse, n->line,
  		    n->pos, "%s %s", roff_name[n->tok], n->child->string);
  
  	while (n->child != NULL)
--- 901,907 ----
  	post_useless(mdoc);
  	n = mdoc->last;
  	if (n->child != NULL)
! 		mandoc_msg(MANDOCERR_ARG_SKIP, n->line,
  		    n->pos, "%s %s", roff_name[n->tok], n->child->string);
  
  	while (n->child != NULL)
***************
*** 987,994 ****
  		mdoc->next = ROFF_NEXT_SIBLING;
  		ic = 1;
  	} else {
! 		mandoc_msg(MANDOCERR_EX_NONAME, mdoc->parse,
! 		    n->line, n->pos, "Ex");
  		ic = 0;
  	}
  
--- 964,970 ----
  		mdoc->next = ROFF_NEXT_SIBLING;
  		ic = 1;
  	} else {
! 		mandoc_msg(MANDOCERR_EX_NONAME, n->line, n->pos, "Ex");
  		ic = 0;
  	}
  
***************
*** 1072,1079 ****
  		if (n->args->argv[0].arg == MDOC_Std)
  			return;
  
! 	mandoc_msg(MANDOCERR_ARG_STD, mdoc->parse,
! 	    n->line, n->pos, roff_name[n->tok]);
  }
  
  static void
--- 1048,1055 ----
  		if (n->args->argv[0].arg == MDOC_Std)
  			return;
  
! 	mandoc_msg(MANDOCERR_ARG_STD, n->line, n->pos,
! 	    "%s", roff_name[n->tok]);
  }
  
  static void
***************
*** 1087,1093 ****
  	assert(nch->type == ROFFT_TEXT);
  
  	if ((p = mdoc_a2st(nch->string)) == NULL) {
! 		mandoc_vmsg(MANDOCERR_ST_BAD, mdoc->parse,
  		    nch->line, nch->pos, "St %s", nch->string);
  		roff_node_delete(mdoc, n);
  		return;
--- 1063,1069 ----
  	assert(nch->type == ROFFT_TEXT);
  
  	if ((p = mdoc_a2st(nch->string)) == NULL) {
! 		mandoc_msg(MANDOCERR_ST_BAD,
  		    nch->line, nch->pos, "St %s", nch->string);
  		roff_node_delete(mdoc, n);
  		return;
***************
*** 1107,1114 ****
  
  	n = mdoc->last;
  	if (n->type == ROFFT_ELEM || n->type == ROFFT_BLOCK)
! 		mandoc_msg(MANDOCERR_MACRO_OBS, mdoc->parse,
! 		    n->line, n->pos, roff_name[n->tok]);
  }
  
  static void
--- 1083,1090 ----
  
  	n = mdoc->last;
  	if (n->type == ROFFT_ELEM || n->type == ROFFT_BLOCK)
! 		mandoc_msg(MANDOCERR_MACRO_OBS, n->line, n->pos,
! 		    "%s", roff_name[n->tok]);
  }
  
  static void
***************
*** 1117,1124 ****
  	struct roff_node *n;
  
  	n = mdoc->last;
! 	mandoc_msg(MANDOCERR_MACRO_USELESS, mdoc->parse,
! 	    n->line, n->pos, roff_name[n->tok]);
  }
  
  /*
--- 1093,1100 ----
  	struct roff_node *n;
  
  	n = mdoc->last;
! 	mandoc_msg(MANDOCERR_MACRO_USELESS, n->line, n->pos,
! 	    "%s", roff_name[n->tok]);
  }
  
  /*
***************
*** 1147,1160 ****
  	nch = np->child;
  	if (np->parent->args == NULL) {
  		if (nch == NULL) {
! 			mandoc_msg(MANDOCERR_BF_NOFONT, mdoc->parse,
  			    np->line, np->pos, "Bf");
  			return;
  		}
  		nch = nch->next;
  	}
  	if (nch != NULL)
! 		mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse,
  		    nch->line, nch->pos, "Bf ... %s", nch->string);
  
  	/* Extract argument into data. */
--- 1123,1136 ----
  	nch = np->child;
  	if (np->parent->args == NULL) {
  		if (nch == NULL) {
! 			mandoc_msg(MANDOCERR_BF_NOFONT,
  			    np->line, np->pos, "Bf");
  			return;
  		}
  		nch = nch->next;
  	}
  	if (nch != NULL)
! 		mandoc_msg(MANDOCERR_ARG_EXCESS,
  		    nch->line, nch->pos, "Bf ... %s", nch->string);
  
  	/* Extract argument into data. */
***************
*** 1185,1193 ****
  	else if ( ! strcmp(np->child->string, "Sy"))
  		np->norm->Bf.font = FONT_Sy;
  	else
! 		mandoc_vmsg(MANDOCERR_BF_BADFONT, mdoc->parse,
! 		    np->child->line, np->child->pos,
! 		    "Bf %s", np->child->string);
  }
  
  static void
--- 1161,1168 ----
  	else if ( ! strcmp(np->child->string, "Sy"))
  		np->norm->Bf.font = FONT_Sy;
  	else
! 		mandoc_msg(MANDOCERR_BF_BADFONT, np->child->line,
! 		    np->child->pos, "Bf %s", np->child->string);
  }
  
  static void
***************
*** 1201,1208 ****
  	pos = strcspn(n->string, "()");
  	cp = n->string + pos;
  	if ( ! (cp[0] == '\0' || (cp[0] == '(' && cp[1] == '*')))
! 		mandoc_msg(MANDOCERR_FN_PAREN, mdoc->parse,
! 		    n->line, n->pos + pos, n->string);
  }
  
  static void
--- 1176,1183 ----
  	pos = strcspn(n->string, "()");
  	cp = n->string + pos;
  	if ( ! (cp[0] == '\0' || (cp[0] == '(' && cp[1] == '*')))
! 		mandoc_msg(MANDOCERR_FN_PAREN, n->line, n->pos + pos,
! 		    "%s", n->string);
  }
  
  static void
***************
*** 1224,1235 ****
  		return;
  
  	if (n->child == NULL) {
! 		mandoc_msg(MANDOCERR_FO_NOHEAD, mdoc->parse,
! 		    n->line, n->pos, "Fo");
  		return;
  	}
  	if (n->child != n->last) {
! 		mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse,
  		    n->child->next->line, n->child->next->pos,
  		    "Fo ... %s", n->child->next->string);
  		while (n->child != n->last)
--- 1199,1209 ----
  		return;
  
  	if (n->child == NULL) {
! 		mandoc_msg(MANDOCERR_FO_NOHEAD, n->line, n->pos, "Fo");
  		return;
  	}
  	if (n->child != n->last) {
! 		mandoc_msg(MANDOCERR_ARG_EXCESS,
  		    n->child->next->line, n->child->next->pos,
  		    "Fo ... %s", n->child->next->string);
  		while (n->child != n->last)
***************
*** 1253,1261 ****
  				break;
  			if (*cp != ',')
  				continue;
! 			mandoc_msg(MANDOCERR_FA_COMMA, mdoc->parse,
! 			    n->line, n->pos + (cp - n->string),
! 			    n->string);
  			break;
  		}
  	}
--- 1227,1234 ----
  				break;
  			if (*cp != ',')
  				continue;
! 			mandoc_msg(MANDOCERR_FA_COMMA, n->line,
! 			    n->pos + (int)(cp - n->string), "%s", n->string);
  			break;
  		}
  	}
***************
*** 1281,1288 ****
  
  	if (mdoc->meta.name == NULL ||
  	    (mdoc->lastsec == SEC_NAME && n->child == NULL))
! 		mandoc_msg(MANDOCERR_NM_NONAME, mdoc->parse,
! 		    n->line, n->pos, "Nm");
  
  	switch (n->type) {
  	case ROFFT_ELEM:
--- 1254,1260 ----
  
  	if (mdoc->meta.name == NULL ||
  	    (mdoc->lastsec == SEC_NAME && n->child == NULL))
! 		mandoc_msg(MANDOCERR_NM_NONAME, n->line, n->pos, "Nm");
  
  	switch (n->type) {
  	case ROFFT_ELEM:
***************
*** 1316,1327 ****
  		return;
  
  	if (n->sec != SEC_NAME)
! 		mandoc_msg(MANDOCERR_ND_LATE, mdoc->parse,
! 		    n->line, n->pos, "Nd");
  
  	if (n->child == NULL)
! 		mandoc_msg(MANDOCERR_ND_EMPTY, mdoc->parse,
! 		    n->line, n->pos, "Nd");
  	else
  		post_delim(mdoc);
  
--- 1288,1297 ----
  		return;
  
  	if (n->sec != SEC_NAME)
! 		mandoc_msg(MANDOCERR_ND_LATE, n->line, n->pos, "Nd");
  
  	if (n->child == NULL)
! 		mandoc_msg(MANDOCERR_ND_EMPTY, n->line, n->pos, "Nd");
  	else
  		post_delim(mdoc);
  
***************
*** 1341,1348 ****
  			    n->body->parent->args == NULL)
  				roff_node_delete(mdoc, n);
  		} else if (n->child == NULL)
! 			mandoc_msg(MANDOCERR_BLK_EMPTY, mdoc->parse,
! 			    n->line, n->pos, roff_name[n->tok]);
  		else if (n->tok == MDOC_D1)
  			post_hyph(mdoc);
  		break;
--- 1311,1318 ----
  			    n->body->parent->args == NULL)
  				roff_node_delete(mdoc, n);
  		} else if (n->child == NULL)
! 			mandoc_msg(MANDOCERR_BLK_EMPTY, n->line, n->pos,
! 			    "%s", roff_name[n->tok]);
  		else if (n->tok == MDOC_D1)
  			post_hyph(mdoc);
  		break;
***************
*** 1350,1356 ****
  		if (n->tok == MDOC_Bd) {
  			if (n->args == NULL) {
  				mandoc_msg(MANDOCERR_BD_NOARG,
! 				    mdoc->parse, n->line, n->pos, "Bd");
  				mdoc->next = ROFF_NEXT_SIBLING;
  				while (n->body->child != NULL)
  					roff_node_relink(mdoc,
--- 1320,1326 ----
  		if (n->tok == MDOC_Bd) {
  			if (n->args == NULL) {
  				mandoc_msg(MANDOCERR_BD_NOARG,
! 				    n->line, n->pos, "Bd");
  				mdoc->next = ROFF_NEXT_SIBLING;
  				while (n->body->child != NULL)
  					roff_node_relink(mdoc,
***************
*** 1363,1371 ****
  		}
  		for (np = n->parent; np != NULL; np = np->parent) {
  			if (np->type == ROFFT_BLOCK && np->tok == MDOC_Bd) {
! 				mandoc_vmsg(MANDOCERR_BD_NEST,
! 				    mdoc->parse, n->line, n->pos,
! 				    "%s in Bd", roff_name[n->tok]);
  				break;
  			}
  		}
--- 1333,1340 ----
  		}
  		for (np = n->parent; np != NULL; np = np->parent) {
  			if (np->type == ROFFT_BLOCK && np->tok == MDOC_Bd) {
! 				mandoc_msg(MANDOCERR_BD_NEST, n->line,
! 				    n->pos, "%s in Bd", roff_name[n->tok]);
  				break;
  			}
  		}
***************
*** 1429,1435 ****
  
  	att = NULL;
  	if (nch != NULL && ((att = mdoc_a2att(nch->string)) == NULL))
! 		mandoc_vmsg(MANDOCERR_AT_BAD, mdoc->parse,
  		    nch->line, nch->pos, "At %s", nch->string);
  
  	mdoc->next = ROFF_NEXT_CHILD;
--- 1398,1404 ----
  
  	att = NULL;
  	if (nch != NULL && ((att = mdoc_a2att(nch->string)) == NULL))
! 		mandoc_msg(MANDOCERR_AT_BAD,
  		    nch->line, nch->pos, "At %s", nch->string);
  
  	mdoc->next = ROFF_NEXT_CHILD;
***************
*** 1453,1464 ****
  	nch = np->child;
  	if (np->norm->An.auth == AUTH__NONE) {
  		if (nch == NULL)
! 			mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
  			    np->line, np->pos, "An");
  		else
  			post_delim_nb(mdoc);
  	} else if (nch != NULL)
! 		mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse,
  		    nch->line, nch->pos, "An ... %s", nch->string);
  }
  
--- 1422,1433 ----
  	nch = np->child;
  	if (np->norm->An.auth == AUTH__NONE) {
  		if (nch == NULL)
! 			mandoc_msg(MANDOCERR_MACRO_EMPTY,
  			    np->line, np->pos, "An");
  		else
  			post_delim_nb(mdoc);
  	} else if (nch != NULL)
! 		mandoc_msg(MANDOCERR_ARG_EXCESS,
  		    nch->line, nch->pos, "An ... %s", nch->string);
  }
  
***************
*** 1554,1562 ****
  	case LIST_inset:
  	case LIST_diag:
  		if (nit->head->child == NULL)
! 			mandoc_vmsg(MANDOCERR_IT_NOHEAD,
! 			    mdoc->parse, nit->line, nit->pos,
! 			    "Bl -%s It",
  			    mdoc_argnames[nbl->args->argv[0].arg]);
  		break;
  	case LIST_bullet:
--- 1523,1530 ----
  	case LIST_inset:
  	case LIST_diag:
  		if (nit->head->child == NULL)
! 			mandoc_msg(MANDOCERR_IT_NOHEAD,
! 			    nit->line, nit->pos, "Bl -%s It",
  			    mdoc_argnames[nbl->args->argv[0].arg]);
  		break;
  	case LIST_bullet:
***************
*** 1564,1577 ****
  	case LIST_enum:
  	case LIST_hyphen:
  		if (nit->body == NULL || nit->body->child == NULL)
! 			mandoc_vmsg(MANDOCERR_IT_NOBODY,
! 			    mdoc->parse, nit->line, nit->pos,
! 			    "Bl -%s It",
  			    mdoc_argnames[nbl->args->argv[0].arg]);
  		/* FALLTHROUGH */
  	case LIST_item:
  		if ((nch = nit->head->child) != NULL)
! 			mandoc_vmsg(MANDOCERR_ARG_SKIP, mdoc->parse,
  			    nit->line, nit->pos, "It %s",
  			    nch->string == NULL ? roff_name[nch->tok] :
  			    nch->string);
--- 1532,1544 ----
  	case LIST_enum:
  	case LIST_hyphen:
  		if (nit->body == NULL || nit->body->child == NULL)
! 			mandoc_msg(MANDOCERR_IT_NOBODY,
! 			    nit->line, nit->pos, "Bl -%s It",
  			    mdoc_argnames[nbl->args->argv[0].arg]);
  		/* FALLTHROUGH */
  	case LIST_item:
  		if ((nch = nit->head->child) != NULL)
! 			mandoc_msg(MANDOCERR_ARG_SKIP,
  			    nit->line, nit->pos, "It %s",
  			    nch->string == NULL ? roff_name[nch->tok] :
  			    nch->string);
***************
*** 1583,1589 ****
  
  		if (nit->head->next->child == NULL &&
  		    nit->head->next->next == NULL) {
! 			mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
  			    nit->line, nit->pos, "It");
  			roff_node_delete(mdoc, nit);
  			break;
--- 1550,1556 ----
  
  		if (nit->head->next->child == NULL &&
  		    nit->head->next->next == NULL) {
! 			mandoc_msg(MANDOCERR_MACRO_EMPTY,
  			    nit->line, nit->pos, "It");
  			roff_node_delete(mdoc, nit);
  			break;
***************
*** 1594,1609 ****
  			if (nch->type != ROFFT_BODY)
  				continue;
  			if (i++ && nch->flags & NODE_LINE)
! 				mandoc_msg(MANDOCERR_TA_LINE, mdoc->parse,
  				    nch->line, nch->pos, "Ta");
  		}
  		if (i < cols || i > cols + 1)
! 			mandoc_vmsg(MANDOCERR_BL_COL,
! 			    mdoc->parse, nit->line, nit->pos,
  			    "%d columns, %d cells", cols, i);
  		else if (nit->head->next->child != NULL &&
  		    nit->head->next->child->line > nit->line)
! 			mandoc_msg(MANDOCERR_IT_NOARG, mdoc->parse,
  			    nit->line, nit->pos, "Bl -column It");
  		break;
  	default:
--- 1561,1575 ----
  			if (nch->type != ROFFT_BODY)
  				continue;
  			if (i++ && nch->flags & NODE_LINE)
! 				mandoc_msg(MANDOCERR_TA_LINE,
  				    nch->line, nch->pos, "Ta");
  		}
  		if (i < cols || i > cols + 1)
! 			mandoc_msg(MANDOCERR_BL_COL, nit->line, nit->pos,
  			    "%d columns, %d cells", cols, i);
  		else if (nit->head->next->child != NULL &&
  		    nit->head->next->child->line > nit->line)
! 			mandoc_msg(MANDOCERR_IT_NOARG,
  			    nit->line, nit->pos, "Bl -column It");
  		break;
  	default:
***************
*** 1633,1646 ****
  				continue;
  			}
  			if (ni->next == NULL) {
! 				mandoc_msg(MANDOCERR_PAR_MOVE,
! 				    mdoc->parse, nc->line, nc->pos,
! 				    roff_name[nc->tok]);
  				roff_node_relink(mdoc, nc);
  			} else if (n->norm->Bl.comp == 0 &&
  			    n->norm->Bl.type != LIST_column) {
! 				mandoc_vmsg(MANDOCERR_PAR_SKIP,
! 				    mdoc->parse, nc->line, nc->pos,
  				    "%s before It", roff_name[nc->tok]);
  				roff_node_delete(mdoc, nc);
  			} else
--- 1599,1611 ----
  				continue;
  			}
  			if (ni->next == NULL) {
! 				mandoc_msg(MANDOCERR_PAR_MOVE, nc->line,
! 				    nc->pos, "%s", roff_name[nc->tok]);
  				roff_node_relink(mdoc, nc);
  			} else if (n->norm->Bl.comp == 0 &&
  			    n->norm->Bl.type != LIST_column) {
! 				mandoc_msg(MANDOCERR_PAR_SKIP,
! 				    nc->line, nc->pos,
  				    "%s before It", roff_name[nc->tok]);
  				roff_node_delete(mdoc, nc);
  			} else
***************
*** 1686,1692 ****
  	if (nh->norm->Bl.type != LIST_column) {
  		if ((nch = nh->child) == NULL)
  			return;
! 		mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse,
  		    nch->line, nch->pos, "Bl ... %s", nch->string);
  		while (nch != NULL) {
  			roff_node_delete(mdoc, nch);
--- 1651,1657 ----
  	if (nh->norm->Bl.type != LIST_column) {
  		if ((nch = nh->child) == NULL)
  			return;
! 		mandoc_msg(MANDOCERR_ARG_EXCESS,
  		    nch->line, nch->pos, "Bl ... %s", nch->string);
  		while (nch != NULL) {
  			roff_node_delete(mdoc, nch);
***************
*** 1763,1769 ****
  
  	nchild = nbody->child;
  	if (nchild == NULL) {
! 		mandoc_msg(MANDOCERR_BLK_EMPTY, mdoc->parse,
  		    nbody->line, nbody->pos, "Bl");
  		return;
  	}
--- 1728,1734 ----
  
  	nchild = nbody->child;
  	if (nchild == NULL) {
! 		mandoc_msg(MANDOCERR_BLK_EMPTY,
  		    nbody->line, nbody->pos, "Bl");
  		return;
  	}
***************
*** 1806,1813 ****
  			continue;
  		}
  
! 		mandoc_msg(MANDOCERR_BL_MOVE, mdoc->parse,
! 		    nchild->line, nchild->pos, roff_name[nchild->tok]);
  
  		/*
  		 * Move the node out of the Bl block.
--- 1771,1778 ----
  			continue;
  		}
  
! 		mandoc_msg(MANDOCERR_BL_MOVE, nchild->line, nchild->pos,
! 		    "%s", roff_name[nchild->tok]);
  
  		/*
  		 * Move the node out of the Bl block.
***************
*** 1862,1874 ****
  		if (prev_Er != NULL) {
  			order = strcmp(prev_Er, nnext->string);
  			if (order > 0)
! 				mandoc_vmsg(MANDOCERR_ER_ORDER,
! 				    mdoc->parse, nnext->line, nnext->pos,
  				    "Er %s %s (NetBSD)",
  				    prev_Er, nnext->string);
  			else if (order == 0)
! 				mandoc_vmsg(MANDOCERR_ER_REP,
! 				    mdoc->parse, nnext->line, nnext->pos,
  				    "Er %s (NetBSD)", prev_Er);
  		}
  		prev_Er = nnext->string;
--- 1827,1839 ----
  		if (prev_Er != NULL) {
  			order = strcmp(prev_Er, nnext->string);
  			if (order > 0)
! 				mandoc_msg(MANDOCERR_ER_ORDER,
! 				    nnext->line, nnext->pos,
  				    "Er %s %s (NetBSD)",
  				    prev_Er, nnext->string);
  			else if (order == 0)
! 				mandoc_msg(MANDOCERR_ER_REP,
! 				    nnext->line, nnext->pos,
  				    "Er %s (NetBSD)", prev_Er);
  		}
  		prev_Er = nnext->string;
***************
*** 1883,1890 ****
  	n = mdoc->last;
  
  	if (n->type == ROFFT_BLOCK && n->body->child == NULL) {
! 		mandoc_msg(MANDOCERR_BLK_EMPTY,
! 		    mdoc->parse, n->line, n->pos, "Bk");
  		roff_node_delete(mdoc, n);
  	}
  }
--- 1848,1854 ----
  	n = mdoc->last;
  
  	if (n->type == ROFFT_BLOCK && n->body->child == NULL) {
! 		mandoc_msg(MANDOCERR_BLK_EMPTY, n->line, n->pos, "Bk");
  		roff_node_delete(mdoc, n);
  	}
  }
***************
*** 1912,1919 ****
  		return;
  	}
  
! 	mandoc_vmsg(MANDOCERR_SM_BAD,
! 	    mdoc->parse, nch->line, nch->pos,
  	    "%s %s", roff_name[mdoc->last->tok], nch->string);
  	roff_node_relink(mdoc, nch);
  	return;
--- 1876,1882 ----
  		return;
  	}
  
! 	mandoc_msg(MANDOCERR_SM_BAD, nch->line, nch->pos,
  	    "%s %s", roff_name[mdoc->last->tok], nch->string);
  	roff_node_relink(mdoc, nch);
  	return;
***************
*** 1953,1960 ****
  		    mandoc_normdate(mdoc, NULL, 0, 0);
  
  	if (mdoc->meta.title == NULL) {
! 		mandoc_msg(MANDOCERR_DT_NOTITLE,
! 		    mdoc->parse, 0, 0, "EOF");
  		mdoc->meta.title = mandoc_strdup("UNTITLED");
  	}
  
--- 1916,1922 ----
  		    mandoc_normdate(mdoc, NULL, 0, 0);
  
  	if (mdoc->meta.title == NULL) {
! 		mandoc_msg(MANDOCERR_DT_NOTITLE, 0, 0, "EOF");
  		mdoc->meta.title = mandoc_strdup("UNTITLED");
  	}
  
***************
*** 1962,1973 ****
  		mdoc->meta.vol = mandoc_strdup("LOCAL");
  
  	if (mdoc->meta.os == NULL) {
! 		mandoc_msg(MANDOCERR_OS_MISSING,
! 		    mdoc->parse, 0, 0, NULL);
  		mdoc->meta.os = mandoc_strdup("");
  	} else if (mdoc->meta.os_e &&
  	    (mdoc->meta.rcsids & (1 << mdoc->meta.os_e)) == 0)
! 		mandoc_msg(MANDOCERR_RCS_MISSING, mdoc->parse, 0, 0,
  		    mdoc->meta.os_e == MANDOC_OS_OPENBSD ?
  		    "(OpenBSD)" : "(NetBSD)");
  
--- 1924,1934 ----
  		mdoc->meta.vol = mandoc_strdup("LOCAL");
  
  	if (mdoc->meta.os == NULL) {
! 		mandoc_msg(MANDOCERR_OS_MISSING, 0, 0, NULL);
  		mdoc->meta.os = mandoc_strdup("");
  	} else if (mdoc->meta.os_e &&
  	    (mdoc->meta.rcsids & (1 << mdoc->meta.os_e)) == 0)
! 		mandoc_msg(MANDOCERR_RCS_MISSING, 0, 0,
  		    mdoc->meta.os_e == MANDOC_OS_OPENBSD ?
  		    "(OpenBSD)" : "(NetBSD)");
  
***************
*** 1983,1990 ****
  			    n->child->next->next == NULL)
  				n = n->next;
  			n = n->child->next->next;
! 			mandoc_vmsg(MANDOCERR_ARCH_BAD,
! 			    mdoc->parse, n->line, n->pos,
  			    "Dt ... %s %s", mdoc->meta.arch,
  			    mdoc->meta.os_e == MANDOC_OS_OPENBSD ?
  			    "(OpenBSD)" : "(NetBSD)");
--- 1944,1950 ----
  			    n->child->next->next == NULL)
  				n = n->next;
  			n = n->child->next->next;
! 			mandoc_msg(MANDOCERR_ARCH_BAD, n->line, n->pos,
  			    "Dt ... %s %s", mdoc->meta.arch,
  			    mdoc->meta.os_e == MANDOC_OS_OPENBSD ?
  			    "(OpenBSD)" : "(NetBSD)");
***************
*** 2001,2010 ****
  		n = n->next;
  
  	if (n == NULL)
! 		mandoc_msg(MANDOCERR_DOC_EMPTY, mdoc->parse, 0, 0, NULL);
  	else if (n->tok != MDOC_Sh)
! 		mandoc_msg(MANDOCERR_SEC_BEFORE, mdoc->parse,
! 		    n->line, n->pos, roff_name[n->tok]);
  }
  
  static void
--- 1961,1970 ----
  		n = n->next;
  
  	if (n == NULL)
! 		mandoc_msg(MANDOCERR_DOC_EMPTY, 0, 0, NULL);
  	else if (n->tok != MDOC_Sh)
! 		mandoc_msg(MANDOCERR_SEC_BEFORE, n->line, n->pos,
! 		    "%s", roff_name[n->tok]);
  }
  
  static void
***************
*** 2019,2026 ****
  		return;
  
  	if (np->child == NULL) {
! 		mandoc_msg(MANDOCERR_RS_EMPTY, mdoc->parse,
! 		    np->line, np->pos, "Rs");
  		return;
  	}
  
--- 1979,1985 ----
  		return;
  
  	if (np->child == NULL) {
! 		mandoc_msg(MANDOCERR_RS_EMPTY, np->line, np->pos, "Rs");
  		return;
  	}
  
***************
*** 2038,2045 ****
  				break;
  
  		if (i == RSORD_MAX) {
! 			mandoc_msg(MANDOCERR_RS_BAD, mdoc->parse,
! 			    nch->line, nch->pos, roff_name[nch->tok]);
  			i = -1;
  		} else if (nch->tok == MDOC__J || nch->tok == MDOC__B)
  			np->norm->Rs.quote_T++;
--- 1997,2004 ----
  				break;
  
  		if (i == RSORD_MAX) {
! 			mandoc_msg(MANDOCERR_RS_BAD, nch->line, nch->pos,
! 			    "%s", roff_name[nch->tok]);
  			i = -1;
  		} else if (nch->tok == MDOC__J || nch->tok == MDOC__B)
  			np->norm->Rs.quote_T++;
***************
*** 2128,2135 ****
  	n = mdoc->last;
  	if (n->flags & NODE_LINE ||
  	    (n->next != NULL && n->next->flags & NODE_DELIMC))
! 		mandoc_msg(MANDOCERR_NS_SKIP, mdoc->parse,
! 		    n->line, n->pos, NULL);
  }
  
  static void
--- 2087,2093 ----
  	n = mdoc->last;
  	if (n->flags & NODE_LINE ||
  	    (n->next != NULL && n->next->flags & NODE_DELIMC))
! 		mandoc_msg(MANDOCERR_NS_SKIP, n->line, n->pos, NULL);
  }
  
  static void
***************
*** 2181,2188 ****
  		switch (n->tok) {
  		case MDOC_Nm:
  			if (hasnm && n->child != NULL)
! 				mandoc_vmsg(MANDOCERR_NAMESEC_PUNCT,
! 				    mdoc->parse, n->line, n->pos,
  				    "Nm %s", n->child->string);
  			hasnm = 1;
  			continue;
--- 2139,2146 ----
  		switch (n->tok) {
  		case MDOC_Nm:
  			if (hasnm && n->child != NULL)
! 				mandoc_msg(MANDOCERR_NAMESEC_PUNCT,
! 				    n->line, n->pos,
  				    "Nm %s", n->child->string);
  			hasnm = 1;
  			continue;
***************
*** 2190,2196 ****
  			hasnd = 1;
  			if (n->next != NULL)
  				mandoc_msg(MANDOCERR_NAMESEC_ND,
! 				    mdoc->parse, n->line, n->pos, NULL);
  			break;
  		case TOKEN_NONE:
  			if (n->type == ROFFT_TEXT &&
--- 2148,2154 ----
  			hasnd = 1;
  			if (n->next != NULL)
  				mandoc_msg(MANDOCERR_NAMESEC_ND,
! 				    n->line, n->pos, NULL);
  			break;
  		case TOKEN_NONE:
  			if (n->type == ROFFT_TEXT &&
***************
*** 2201,2218 ****
  			}
  			/* FALLTHROUGH */
  		default:
! 			mandoc_msg(MANDOCERR_NAMESEC_BAD, mdoc->parse,
! 			    n->line, n->pos, roff_name[n->tok]);
  			continue;
  		}
  		break;
  	}
  
  	if ( ! hasnm)
! 		mandoc_msg(MANDOCERR_NAMESEC_NONM, mdoc->parse,
  		    mdoc->last->line, mdoc->last->pos, NULL);
  	if ( ! hasnd)
! 		mandoc_msg(MANDOCERR_NAMESEC_NOND, mdoc->parse,
  		    mdoc->last->line, mdoc->last->pos, NULL);
  }
  
--- 2159,2176 ----
  			}
  			/* FALLTHROUGH */
  		default:
! 			mandoc_msg(MANDOCERR_NAMESEC_BAD,
! 			    n->line, n->pos, "%s", roff_name[n->tok]);
  			continue;
  		}
  		break;
  	}
  
  	if ( ! hasnm)
! 		mandoc_msg(MANDOCERR_NAMESEC_NONM,
  		    mdoc->last->line, mdoc->last->pos, NULL);
  	if ( ! hasnd)
! 		mandoc_msg(MANDOCERR_NAMESEC_NOND,
  		    mdoc->last->line, mdoc->last->pos, NULL);
  }
  
***************
*** 2238,2258 ****
  		sec = n->child->next->string;
  		if (lastsec != NULL) {
  			if (lastpunct[0] != ',' || lastpunct[1] != '\0')
! 				mandoc_vmsg(MANDOCERR_XR_PUNCT,
! 				    mdoc->parse, n->line, n->pos,
! 				    "%s before %s(%s)", lastpunct,
! 				    name, sec);
  			cmp = strcmp(lastsec, sec);
  			if (cmp > 0)
! 				mandoc_vmsg(MANDOCERR_XR_ORDER,
! 				    mdoc->parse, n->line, n->pos,
! 				    "%s(%s) after %s(%s)", name,
! 				    sec, lastname, lastsec);
  			else if (cmp == 0 &&
  			    strcasecmp(lastname, name) > 0)
! 				mandoc_vmsg(MANDOCERR_XR_ORDER,
! 				    mdoc->parse, n->line, n->pos,
! 				    "%s after %s", name, lastname);
  		}
  		lastname = name;
  		lastsec = sec;
--- 2196,2213 ----
  		sec = n->child->next->string;
  		if (lastsec != NULL) {
  			if (lastpunct[0] != ',' || lastpunct[1] != '\0')
! 				mandoc_msg(MANDOCERR_XR_PUNCT, n->line,
! 				    n->pos, "%s before %s(%s)",
! 				    lastpunct, name, sec);
  			cmp = strcmp(lastsec, sec);
  			if (cmp > 0)
! 				mandoc_msg(MANDOCERR_XR_ORDER, n->line,
! 				    n->pos, "%s(%s) after %s(%s)",
! 				    name, sec, lastname, lastsec);
  			else if (cmp == 0 &&
  			    strcasecmp(lastname, name) > 0)
! 				mandoc_msg(MANDOCERR_XR_ORDER, n->line,
! 				    n->pos, "%s after %s", name, lastname);
  		}
  		lastname = name;
  		lastsec = sec;
***************
*** 2273,2280 ****
  				return;
  		lastpunct = n->string;
  		if (n->next == NULL || n->next->tok == MDOC_Rs)
! 			mandoc_vmsg(MANDOCERR_XR_PUNCT, mdoc->parse,
! 			    n->line, n->pos, "%s after %s(%s)",
  			    lastpunct, lastname, lastsec);
  		n = n->next;
  	}
--- 2228,2235 ----
  				return;
  		lastpunct = n->string;
  		if (n->next == NULL || n->next->tok == MDOC_Rs)
! 			mandoc_msg(MANDOCERR_XR_PUNCT, n->line,
! 			    n->pos, "%s after %s(%s)",
  			    lastpunct, lastname, lastsec);
  		n = n->next;
  	}
***************
*** 2295,2301 ****
  {
  
  	if ( ! child_an(mdoc->last))
! 		mandoc_msg(MANDOCERR_AN_MISSING, mdoc->parse,
  		    mdoc->last->line, mdoc->last->pos, NULL);
  }
  
--- 2250,2256 ----
  {
  
  	if ( ! child_an(mdoc->last))
! 		mandoc_msg(MANDOCERR_AN_MISSING,
  		    mdoc->last->line, mdoc->last->pos, NULL);
  }
  
***************
*** 2361,2367 ****
  	/* The NAME should be first. */
  
  	if (sec != SEC_NAME && mdoc->lastnamed == SEC_NONE)
! 		mandoc_vmsg(MANDOCERR_NAMESEC_FIRST, mdoc->parse,
  		    mdoc->last->line, mdoc->last->pos, "Sh %s",
  		    sec != SEC_CUSTOM ? secnames[sec] :
  		    (nch = mdoc->last->child) == NULL ? "" :
--- 2316,2322 ----
  	/* The NAME should be first. */
  
  	if (sec != SEC_NAME && mdoc->lastnamed == SEC_NONE)
! 		mandoc_msg(MANDOCERR_NAMESEC_FIRST,
  		    mdoc->last->line, mdoc->last->pos, "Sh %s",
  		    sec != SEC_CUSTOM ? secnames[sec] :
  		    (nch = mdoc->last->child) == NULL ? "" :
***************
*** 2398,2406 ****
  			}
  		}
  		if (goodsec != NULL)
! 			mandoc_vmsg(MANDOCERR_SEC_TYPO, mdoc->parse,
! 			    nch->line, nch->pos, "Sh %s instead of %s",
! 			    nch->string, goodsec);
  		return;
  	}
  
--- 2353,2360 ----
  			}
  		}
  		if (goodsec != NULL)
! 			mandoc_msg(MANDOCERR_SEC_TYPO, nch->line, nch->pos,
! 			    "Sh %s instead of %s", nch->string, goodsec);
  		return;
  	}
  
***************
*** 2410,2423 ****
  	 */
  
  	if (sec == mdoc->lastnamed)
! 		mandoc_vmsg(MANDOCERR_SEC_REP, mdoc->parse,
! 		    mdoc->last->line, mdoc->last->pos,
! 		    "Sh %s", secnames[sec]);
  
  	if (sec < mdoc->lastnamed)
! 		mandoc_vmsg(MANDOCERR_SEC_ORDER, mdoc->parse,
! 		    mdoc->last->line, mdoc->last->pos,
! 		    "Sh %s", secnames[sec]);
  
  	/* Mark the last named section. */
  
--- 2364,2375 ----
  	 */
  
  	if (sec == mdoc->lastnamed)
! 		mandoc_msg(MANDOCERR_SEC_REP, mdoc->last->line,
! 		    mdoc->last->pos, "Sh %s", secnames[sec]);
  
  	if (sec < mdoc->lastnamed)
! 		mandoc_msg(MANDOCERR_SEC_ORDER, mdoc->last->line,
! 		    mdoc->last->pos, "Sh %s", secnames[sec]);
  
  	/* Mark the last named section. */
  
***************
*** 2449,2455 ****
  			break;
  		if (NULL == goodsec)
  			goodsec = "9";
! 		mandoc_vmsg(MANDOCERR_SEC_MSEC, mdoc->parse,
  		    mdoc->last->line, mdoc->last->pos,
  		    "Sh %s for %s only", secnames[sec], goodsec);
  		break;
--- 2401,2407 ----
  			break;
  		if (NULL == goodsec)
  			goodsec = "9";
! 		mandoc_msg(MANDOCERR_SEC_MSEC,
  		    mdoc->last->line, mdoc->last->pos,
  		    "Sh %s for %s only", secnames[sec], goodsec);
  		break;
***************
*** 2466,2478 ****
  	n = mdoc->last;
  	nch = n->child;
  	if (nch->next == NULL) {
! 		mandoc_vmsg(MANDOCERR_XR_NOSEC, mdoc->parse,
  		    n->line, n->pos, "Xr %s", nch->string);
  	} else {
  		assert(nch->next == n->last);
  		if(mandoc_xr_add(nch->next->string, nch->string,
  		    nch->line, nch->pos))
! 			mandoc_vmsg(MANDOCERR_XR_SELF, mdoc->parse,
  			    nch->line, nch->pos, "Xr %s %s",
  			    nch->string, nch->next->string);
  	}
--- 2418,2430 ----
  	n = mdoc->last;
  	nch = n->child;
  	if (nch->next == NULL) {
! 		mandoc_msg(MANDOCERR_XR_NOSEC,
  		    n->line, n->pos, "Xr %s", nch->string);
  	} else {
  		assert(nch->next == n->last);
  		if(mandoc_xr_add(nch->next->string, nch->string,
  		    nch->line, nch->pos))
! 			mandoc_msg(MANDOCERR_XR_SELF,
  			    nch->line, nch->pos, "Xr %s %s",
  			    nch->string, nch->next->string);
  	}
***************
*** 2501,2508 ****
  	if ((np = mdoc->last->child) != NULL)
  		if (np->tok == MDOC_Pp ||
  		    np->tok == ROFF_br || np->tok == ROFF_sp) {
! 			mandoc_vmsg(MANDOCERR_PAR_SKIP,
! 			    mdoc->parse, np->line, np->pos,
  			    "%s after %s", roff_name[np->tok],
  			    roff_name[mdoc->last->tok]);
  			roff_node_delete(mdoc, np);
--- 2453,2459 ----
  	if ((np = mdoc->last->child) != NULL)
  		if (np->tok == MDOC_Pp ||
  		    np->tok == ROFF_br || np->tok == ROFF_sp) {
! 			mandoc_msg(MANDOCERR_PAR_SKIP, np->line, np->pos,
  			    "%s after %s", roff_name[np->tok],
  			    roff_name[mdoc->last->tok]);
  			roff_node_delete(mdoc, np);
***************
*** 2510,2518 ****
  
  	if ((np = mdoc->last->last) != NULL)
  		if (np->tok == MDOC_Pp || np->tok == ROFF_br) {
! 			mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse,
! 			    np->line, np->pos, "%s at the end of %s",
! 			    roff_name[np->tok],
  			    roff_name[mdoc->last->tok]);
  			roff_node_delete(mdoc, np);
  		}
--- 2461,2468 ----
  
  	if ((np = mdoc->last->last) != NULL)
  		if (np->tok == MDOC_Pp || np->tok == ROFF_br) {
! 			mandoc_msg(MANDOCERR_PAR_SKIP, np->line, np->pos,
! 			    "%s at the end of %s", roff_name[np->tok],
  			    roff_name[mdoc->last->tok]);
  			roff_node_delete(mdoc, np);
  		}
***************
*** 2543,2551 ****
  	if (n->tok == MDOC_It && n->parent->norm->Bl.comp)
  		return;
  
! 	mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse,
! 	    n->prev->line, n->prev->pos, "%s before %s",
! 	    roff_name[n->prev->tok], roff_name[n->tok]);
  	roff_node_delete(mdoc, n->prev);
  }
  
--- 2493,2500 ----
  	if (n->tok == MDOC_It && n->parent->norm->Bl.comp)
  		return;
  
! 	mandoc_msg(MANDOCERR_PAR_SKIP, n->prev->line, n->prev->pos,
! 	    "%s before %s", roff_name[n->prev->tok], roff_name[n->tok]);
  	roff_node_delete(mdoc, n->prev);
  }
  
***************
*** 2558,2566 ****
  
  	np = mdoc->last;
  	if (np->child != NULL)
! 		mandoc_vmsg(MANDOCERR_ARG_SKIP,
! 		    mdoc->parse, np->line, np->pos, "%s %s",
! 		    roff_name[np->tok], np->child->string);
  }
  
  static void
--- 2507,2514 ----
  
  	np = mdoc->last;
  	if (np->child != NULL)
! 		mandoc_msg(MANDOCERR_ARG_SKIP, np->line, np->pos,
! 		    "%s %s", roff_name[np->tok], np->child->string);
  }
  
  static void
***************
*** 2573,2589 ****
  	n->flags |= NODE_NOPRT;
  
  	if (mdoc->meta.date != NULL) {
! 		mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse,
! 		    n->line, n->pos, "Dd");
  		free(mdoc->meta.date);
  	} else if (mdoc->flags & MDOC_PBODY)
! 		mandoc_msg(MANDOCERR_PROLOG_LATE, mdoc->parse,
! 		    n->line, n->pos, "Dd");
  	else if (mdoc->meta.title != NULL)
! 		mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse,
  		    n->line, n->pos, "Dd after Dt");
  	else if (mdoc->meta.os != NULL)
! 		mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse,
  		    n->line, n->pos, "Dd after Os");
  
  	if (n->child == NULL || n->child->string[0] == '\0') {
--- 2521,2535 ----
  	n->flags |= NODE_NOPRT;
  
  	if (mdoc->meta.date != NULL) {
! 		mandoc_msg(MANDOCERR_PROLOG_REP, n->line, n->pos, "Dd");
  		free(mdoc->meta.date);
  	} else if (mdoc->flags & MDOC_PBODY)
! 		mandoc_msg(MANDOCERR_PROLOG_LATE, n->line, n->pos, "Dd");
  	else if (mdoc->meta.title != NULL)
! 		mandoc_msg(MANDOCERR_PROLOG_ORDER,
  		    n->line, n->pos, "Dd after Dt");
  	else if (mdoc->meta.os != NULL)
! 		mandoc_msg(MANDOCERR_PROLOG_ORDER,
  		    n->line, n->pos, "Dd after Os");
  
  	if (n->child == NULL || n->child->string[0] == '\0') {
***************
*** 2614,2629 ****
  	n->flags |= NODE_NOPRT;
  
  	if (mdoc->flags & MDOC_PBODY) {
! 		mandoc_msg(MANDOCERR_DT_LATE, mdoc->parse,
! 		    n->line, n->pos, "Dt");
  		return;
  	}
  
  	if (mdoc->meta.title != NULL)
! 		mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse,
! 		    n->line, n->pos, "Dt");
  	else if (mdoc->meta.os != NULL)
! 		mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse,
  		    n->line, n->pos, "Dt after Os");
  
  	free(mdoc->meta.title);
--- 2560,2573 ----
  	n->flags |= NODE_NOPRT;
  
  	if (mdoc->flags & MDOC_PBODY) {
! 		mandoc_msg(MANDOCERR_DT_LATE, n->line, n->pos, "Dt");
  		return;
  	}
  
  	if (mdoc->meta.title != NULL)
! 		mandoc_msg(MANDOCERR_PROLOG_REP, n->line, n->pos, "Dt");
  	else if (mdoc->meta.os != NULL)
! 		mandoc_msg(MANDOCERR_PROLOG_ORDER,
  		    n->line, n->pos, "Dt after Os");
  
  	free(mdoc->meta.title);
***************
*** 2640,2647 ****
  
  	nn = n->child;
  	if (nn == NULL || *nn->string == '\0') {
! 		mandoc_msg(MANDOCERR_DT_NOTITLE,
! 		    mdoc->parse, n->line, n->pos, "Dt");
  		mdoc->meta.title = mandoc_strdup("UNTITLED");
  	} else {
  		mdoc->meta.title = mandoc_strdup(nn->string);
--- 2584,2590 ----
  
  	nn = n->child;
  	if (nn == NULL || *nn->string == '\0') {
! 		mandoc_msg(MANDOCERR_DT_NOTITLE, n->line, n->pos, "Dt");
  		mdoc->meta.title = mandoc_strdup("UNTITLED");
  	} else {
  		mdoc->meta.title = mandoc_strdup(nn->string);
***************
*** 2650,2658 ****
  
  		for (p = nn->string; *p != '\0'; p++)
  			if (islower((unsigned char)*p)) {
! 				mandoc_vmsg(MANDOCERR_TITLE_CASE,
! 				    mdoc->parse, nn->line,
! 				    nn->pos + (p - nn->string),
  				    "Dt %s", nn->string);
  				break;
  			}
--- 2593,2600 ----
  
  		for (p = nn->string; *p != '\0'; p++)
  			if (islower((unsigned char)*p)) {
! 				mandoc_msg(MANDOCERR_TITLE_CASE, nn->line,
! 				    nn->pos + (int)(p - nn->string),
  				    "Dt %s", nn->string);
  				break;
  			}
***************
*** 2664,2671 ****
  		nn = nn->next;
  
  	if (nn == NULL) {
! 		mandoc_vmsg(MANDOCERR_MSEC_MISSING,
! 		    mdoc->parse, n->line, n->pos,
  		    "Dt %s", mdoc->meta.title);
  		mdoc->meta.vol = mandoc_strdup("LOCAL");
  		return;  /* msec and arch remain NULL. */
--- 2606,2612 ----
  		nn = nn->next;
  
  	if (nn == NULL) {
! 		mandoc_msg(MANDOCERR_MSEC_MISSING, n->line, n->pos,
  		    "Dt %s", mdoc->meta.title);
  		mdoc->meta.vol = mandoc_strdup("LOCAL");
  		return;  /* msec and arch remain NULL. */
***************
*** 2677,2683 ****
  
  	cp = mandoc_a2msec(nn->string);
  	if (cp == NULL) {
! 		mandoc_vmsg(MANDOCERR_MSEC_BAD, mdoc->parse,
  		    nn->line, nn->pos, "Dt ... %s", nn->string);
  		mdoc->meta.vol = mandoc_strdup(nn->string);
  	} else
--- 2618,2624 ----
  
  	cp = mandoc_a2msec(nn->string);
  	if (cp == NULL) {
! 		mandoc_msg(MANDOCERR_MSEC_BAD,
  		    nn->line, nn->pos, "Dt ... %s", nn->string);
  		mdoc->meta.vol = mandoc_strdup(nn->string);
  	} else
***************
*** 2695,2701 ****
  	/* Ignore fourth and later arguments. */
  
  	if ((nn = nn->next) != NULL)
! 		mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse,
  		    nn->line, nn->pos, "Dt ... %s", nn->string);
  }
  
--- 2636,2642 ----
  	/* Ignore fourth and later arguments. */
  
  	if ((nn = nn->next) != NULL)
! 		mandoc_msg(MANDOCERR_ARG_EXCESS,
  		    nn->line, nn->pos, "Dt ... %s", nn->string);
  }
  
***************
*** 2716,2723 ****
  		    !strcmp(nch->string, "Free") ? "Fx" :
  		    !strcmp(nch->string, "DragonFly") ? "Dx" : NULL;
  		if (macro != NULL)
! 			mandoc_msg(MANDOCERR_BX, mdoc->parse,
! 			    n->line, n->pos, macro);
  		mdoc->last = nch;
  		nch = nch->next;
  		mdoc->next = ROFF_NEXT_SIBLING;
--- 2657,2664 ----
  		    !strcmp(nch->string, "Free") ? "Fx" :
  		    !strcmp(nch->string, "DragonFly") ? "Dx" : NULL;
  		if (macro != NULL)
! 			mandoc_msg(MANDOCERR_BX,
! 			    n->line, n->pos, "%s", macro);
  		mdoc->last = nch;
  		nch = nch->next;
  		mdoc->next = ROFF_NEXT_SIBLING;
***************
*** 2765,2775 ****
  	n->flags |= NODE_NOPRT;
  
  	if (mdoc->meta.os != NULL)
! 		mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse,
! 		    n->line, n->pos, "Os");
  	else if (mdoc->flags & MDOC_PBODY)
! 		mandoc_msg(MANDOCERR_PROLOG_LATE, mdoc->parse,
! 		    n->line, n->pos, "Os");
  
  	post_delim(mdoc);
  
--- 2706,2714 ----
  	n->flags |= NODE_NOPRT;
  
  	if (mdoc->meta.os != NULL)
! 		mandoc_msg(MANDOCERR_PROLOG_REP, n->line, n->pos, "Os");
  	else if (mdoc->flags & MDOC_PBODY)
! 		mandoc_msg(MANDOCERR_PROLOG_LATE, n->line, n->pos, "Os");
  
  	post_delim(mdoc);
  
***************
*** 2798,2805 ****
  #else /*!OSNAME */
  	if (defbuf == NULL) {
  		if (uname(&utsname) == -1) {
! 			mandoc_msg(MANDOCERR_OS_UNAME, mdoc->parse,
! 			    n->line, n->pos, "Os");
  			defbuf = mandoc_strdup("UNKNOWN");
  		} else
  			mandoc_asprintf(&defbuf, "%s %s",
--- 2737,2743 ----
  #else /*!OSNAME */
  	if (defbuf == NULL) {
  		if (uname(&utsname) == -1) {
! 			mandoc_msg(MANDOCERR_OS_UNAME, n->line, n->pos, "Os");
  			defbuf = mandoc_strdup("UNKNOWN");
  		} else
  			mandoc_asprintf(&defbuf, "%s %s",
***************
*** 2823,2830 ****
  	 */
  
  	if (n->child != NULL)
! 		mandoc_vmsg(MANDOCERR_OS_ARG, mdoc->parse,
! 		    n->child->line, n->child->pos,
  		    "Os %s (%s)", n->child->string,
  		    mdoc->meta.os_e == MANDOC_OS_OPENBSD ?
  		    "OpenBSD" : "NetBSD");
--- 2761,2767 ----
  	 */
  
  	if (n->child != NULL)
! 		mandoc_msg(MANDOCERR_OS_ARG, n->child->line, n->child->pos,
  		    "Os %s (%s)", n->child->string,
  		    mdoc->meta.os_e == MANDOC_OS_OPENBSD ?
  		    "OpenBSD" : "NetBSD");
***************
*** 2836,2849 ****
  		return;
  	if (strncmp(n->string, "$" "Mdocdate", 9)) {
  		if (mdoc->meta.os_e == MANDOC_OS_OPENBSD)
! 			mandoc_vmsg(MANDOCERR_MDOCDATE_MISSING,
! 			    mdoc->parse, n->line, n->pos,
! 			    "Dd %s (OpenBSD)", n->string);
  	} else {
  		if (mdoc->meta.os_e == MANDOC_OS_NETBSD)
! 			mandoc_vmsg(MANDOCERR_MDOCDATE,
! 			    mdoc->parse, n->line, n->pos,
! 			    "Dd %s (NetBSD)", n->string);
  	}
  }
  
--- 2773,2784 ----
  		return;
  	if (strncmp(n->string, "$" "Mdocdate", 9)) {
  		if (mdoc->meta.os_e == MANDOC_OS_OPENBSD)
! 			mandoc_msg(MANDOCERR_MDOCDATE_MISSING, n->line,
! 			    n->pos, "Dd %s (OpenBSD)", n->string);
  	} else {
  		if (mdoc->meta.os_e == MANDOC_OS_NETBSD)
! 			mandoc_msg(MANDOCERR_MDOCDATE, n->line,
! 			    n->pos, "Dd %s (NetBSD)", n->string);
  	}
  }