===================================================================
RCS file: /cvs/mandoc/man_validate.c,v
retrieving revision 1.101
retrieving revision 1.103
diff -u -p -r1.101 -r1.103
--- mandoc/man_validate.c	2014/07/30 23:01:39	1.101
+++ mandoc/man_validate.c	2014/08/01 17:40:34	1.103
@@ -1,4 +1,4 @@
-/*	$Id: man_validate.c,v 1.101 2014/07/30 23:01:39 schwarze Exp $ */
+/*	$Id: man_validate.c,v 1.103 2014/08/01 17:40:34 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -191,12 +191,14 @@ check_root(CHKARGS)
 	assert((man->flags & (MAN_BLINE | MAN_ELINE)) == 0);
 
 	if (NULL == man->first->child)
-		man_nmsg(man, n, MANDOCERR_DOC_EMPTY);
+		mandoc_msg(MANDOCERR_DOC_EMPTY, man->parse,
+		    n->line, n->pos, NULL);
 	else
 		man->meta.hasbody = 1;
 
 	if (NULL == man->meta.title) {
-		man_nmsg(man, n, MANDOCERR_TH_MISSING);
+		mandoc_msg(MANDOCERR_TH_MISSING, man->parse,
+		    n->line, n->pos, NULL);
 
 		/*
 		 * If a title hasn't been set, do so now (by
@@ -404,10 +406,10 @@ post_TH(CHKARGS)
 			/* Only warn about this once... */
 			if (isalpha((unsigned char)*p) &&
 			    ! isupper((unsigned char)*p)) {
-				mandoc_msg(MANDOCERR_TITLE_CASE,
+				mandoc_vmsg(MANDOCERR_TITLE_CASE,
 				    man->parse, n->line,
 				    n->pos + (p - n->string),
-				    n->string);
+				    "TH %s", n->string);
 				break;
 			}
 		}
@@ -435,7 +437,9 @@ post_TH(CHKARGS)
 			n->line, n->pos);
 	} else {
 		man->meta.date = mandoc_strdup("");
-		man_nmsg(man, n ? n : nb, MANDOCERR_DATE_MISSING);
+		mandoc_msg(MANDOCERR_DATE_MISSING, man->parse,
+		    n ? n->line : nb->line,
+		    n ? n->pos : nb->pos, "TH");
 	}
 
 	/* TITLE MSEC DATE ->SOURCE<- VOL */
@@ -465,7 +469,8 @@ post_nf(CHKARGS)
 {
 
 	if (MAN_LITERAL & man->flags)
-		man_nmsg(man, n, MANDOCERR_NF_SKIP);
+		mandoc_msg(MANDOCERR_NF_SKIP, man->parse,
+		    n->line, n->pos, "nf");
 
 	man->flags |= MAN_LITERAL;
 	return(1);
@@ -476,7 +481,8 @@ post_fi(CHKARGS)
 {
 
 	if ( ! (MAN_LITERAL & man->flags))
-		man_nmsg(man, n, MANDOCERR_FI_SKIP);
+		mandoc_msg(MANDOCERR_FI_SKIP, man->parse,
+		    n->line, n->pos, "fi");
 
 	man->flags &= ~MAN_LITERAL;
 	return(1);