=================================================================== RCS file: /cvs/mandoc/man_validate.c,v retrieving revision 1.125 retrieving revision 1.128 diff -u -p -r1.125 -r1.128 --- mandoc/man_validate.c 2017/05/05 02:06:19 1.125 +++ mandoc/man_validate.c 2017/06/11 19:37:01 1.128 @@ -1,4 +1,4 @@ -/* $OpenBSD: man_validate.c,v 1.125 2017/05/05 02:06:19 schwarze Exp $ */ +/* $OpenBSD: man_validate.c,v 1.128 2017/06/11 19:37:01 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010, 2012-2017 Ingo Schwarze @@ -74,7 +74,6 @@ static const v_check __man_valids[MAN_MAX - MAN_TH] = NULL, /* I */ NULL, /* IR */ NULL, /* RI */ - post_vs, /* sp */ NULL, /* nf */ NULL, /* fi */ NULL, /* RE */ @@ -89,7 +88,6 @@ static const v_check __man_valids[MAN_MAX - MAN_TH] = NULL, /* EE */ post_UR, /* UR */ NULL, /* UE */ - NULL, /* ll */ }; static const v_check *man_valids = __man_valids - MAN_TH; @@ -126,6 +124,7 @@ man_node_validate(struct roff_man *man) if (n->tok < ROFF_MAX) { switch (n->tok) { case ROFF_br: + case ROFF_sp: post_vs(man, n); break; default: @@ -168,7 +167,7 @@ check_root(CHKARGS) man->meta.title = mandoc_strdup(""); man->meta.msec = mandoc_strdup(""); man->meta.date = man->quick ? mandoc_strdup("") : - mandoc_normdate(man->parse, NULL, n->line, n->pos); + mandoc_normdate(man, NULL, n->line, n->pos); } } @@ -324,8 +323,7 @@ post_TH(CHKARGS) if (n && n->string && '\0' != n->string[0]) { man->meta.date = man->quick ? mandoc_strdup(n->string) : - mandoc_normdate(man->parse, n->string, - n->line, n->pos); + mandoc_normdate(man, n->string, n->line, n->pos); } else { man->meta.date = mandoc_strdup(""); mandoc_msg(MANDOCERR_DATE_MISSING, man->parse, @@ -446,6 +444,9 @@ post_vs(CHKARGS) switch (n->parent->tok) { case MAN_SH: case MAN_SS: + case MAN_PP: + case MAN_LP: + case MAN_P: mandoc_vmsg(MANDOCERR_PAR_SKIP, man->parse, n->line, n->pos, "%s after %s", roff_name[n->tok], roff_name[n->parent->tok]);