===================================================================
RCS file: /cvs/mandoc/roff_validate.c,v
retrieving revision 1.10
retrieving revision 1.14
diff -u -p -r1.10 -r1.14
--- mandoc/roff_validate.c	2018/08/10 20:40:45	1.10
+++ mandoc/roff_validate.c	2018/12/14 05:18:03	1.14
@@ -1,4 +1,4 @@
-/*	$Id: roff_validate.c,v 1.10 2018/08/10 20:40:45 schwarze Exp $ */
+/*	$Id: roff_validate.c,v 1.14 2018/12/14 05:18:03 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -17,7 +17,7 @@
 #include <sys/types.h>
 
 #include <assert.h>
-#include <stddef.h>
+#include <stdio.h>
 #include <string.h>
 
 #include "mandoc.h"
@@ -29,17 +29,19 @@
 
 typedef	void	(*roff_valid_fp)(ROFF_VALID_ARGS);
 
+static	void	  roff_valid_br(ROFF_VALID_ARGS);
 static	void	  roff_valid_ft(ROFF_VALID_ARGS);
+static	void	  roff_valid_sp(ROFF_VALID_ARGS);
 
 static	const roff_valid_fp roff_valids[ROFF_MAX] = {
-	NULL,  /* br */
+	roff_valid_br,  /* br */
 	NULL,  /* ce */
 	roff_valid_ft,  /* ft */
 	NULL,  /* ll */
 	NULL,  /* mc */
 	NULL,  /* po */
 	NULL,  /* rj */
-	NULL,  /* sp */
+	roff_valid_sp,  /* sp */
 	NULL,  /* ta */
 	NULL,  /* ti */
 };
@@ -57,6 +59,39 @@ roff_validate(struct roff_man *man)
 }
 
 static void
+roff_valid_br(ROFF_VALID_ARGS)
+{
+	struct roff_node	*np;
+
+	if (n->child != NULL)
+		mandoc_msg(MANDOCERR_ARG_SKIP,
+		    n->line, n->pos, "br %s", n->child->string);
+
+	if (n->next != NULL && n->next->type == ROFFT_TEXT &&
+	    *n->next->string == ' ') {
+		mandoc_msg(MANDOCERR_PAR_SKIP, n->line, n->pos,
+		    "br before text line with leading blank");
+		roff_node_delete(man, n);
+		return;
+	}
+
+	if ((np = n->prev) == NULL)
+		return;
+
+	switch (np->tok) {
+	case ROFF_br:
+	case ROFF_sp:
+	case MDOC_Pp:
+		mandoc_msg(MANDOCERR_PAR_SKIP,
+		    n->line, n->pos, "br after %s", roff_name[np->tok]);
+		roff_node_delete(man, n);
+		break;
+	default:
+		break;
+	}
+}
+
+static void
 roff_valid_ft(ROFF_VALID_ARGS)
 {
 	const char		*cp;
@@ -93,7 +128,35 @@ roff_valid_ft(ROFF_VALID_ARGS)
 		break;
 	}
 
-	mandoc_vmsg(MANDOCERR_FT_BAD, man->parse,
-	    n->line, n->pos, "ft %s", cp);
+	mandoc_msg(MANDOCERR_FT_BAD, n->line, n->pos, "ft %s", cp);
 	roff_node_delete(man, n);
+}
+
+static void
+roff_valid_sp(ROFF_VALID_ARGS)
+{
+	struct roff_node	*np;
+
+	if (n->child != NULL && n->child->next != NULL)
+		mandoc_msg(MANDOCERR_ARG_EXCESS,
+		    n->child->next->line, n->child->next->pos,
+		    "sp ... %s", n->child->next->string);
+
+	if ((np = n->prev) == NULL)
+		return;
+
+	switch (np->tok) {
+	case ROFF_br:
+		mandoc_msg(MANDOCERR_PAR_SKIP,
+		    np->line, np->pos, "br before sp");
+		roff_node_delete(man, np);
+		break;
+	case MDOC_Pp:
+		mandoc_msg(MANDOCERR_PAR_SKIP,
+		    n->line, n->pos, "sp after Pp");
+		roff_node_delete(man, n);
+		break;
+	default:
+		break;
+	}
 }