=================================================================== RCS file: /cvs/mandoc/Attic/validate.c,v retrieving revision 1.63 retrieving revision 1.64 diff -u -p -r1.63 -r1.64 --- mandoc/Attic/validate.c 2009/02/27 09:39:40 1.63 +++ mandoc/Attic/validate.c 2009/02/28 13:47:36 1.64 @@ -1,4 +1,4 @@ -/* $Id: validate.c,v 1.63 2009/02/27 09:39:40 kristaps Exp $ */ +/* $Id: validate.c,v 1.64 2009/02/28 13:47:36 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -36,9 +36,7 @@ typedef int (*v_pre)(PRE_ARGS); typedef int (*v_post)(POST_ARGS); -/* FIXME: some sections should only occur in specific msecs. */ -/* FIXME: ignoring Pp. */ -/* FIXME: math symbols. */ +/* TODO: ignoring Pp (it's superfluous in some invocations). */ struct valids { v_pre *pre; @@ -626,11 +624,11 @@ pre_bl(PRE_ARGS) "superfluous -%s argument", mdoc_argnames[MDOC_Width])); case (MDOC_Tag): - if (-1 != width) - break; - return(mdoc_nwarn(mdoc, n, WARN_SYNTAX, - "suggest -%s argument", - mdoc_argnames[MDOC_Width])); + if (-1 == width && ! mdoc_nwarn(mdoc, n, WARN_SYNTAX, + "suggest -%s argument", + mdoc_argnames[MDOC_Width])) + return(0); + break; default: break; } @@ -706,8 +704,6 @@ static int pre_it(PRE_ARGS) { - /* TODO: children too big for -width? */ - if (MDOC_BLOCK != n->type) return(1); return(check_parent(mdoc, n, MDOC_Bl, MDOC_BODY)); @@ -1056,19 +1052,25 @@ post_bl(POST_ARGS) if (MDOC_BODY != mdoc->last->type) return(1); + if (NULL == (mdoc->last->child)) + return(1); + /* + * Only allow `It' macros to be the immediate descendants of the + * `Bl' list. + */ + /* LINTED */ for (n = mdoc->last->child; n; n = n->next) { if (MDOC_BLOCK == n->type) if (MDOC_It == n->tok) continue; - break; + + return(mdoc_nerr(mdoc, n, "bad child of parent %s", + mdoc_macronames[mdoc->last->tok])); } - if (NULL == n) - return(1); - - return(mdoc_nerr(mdoc, n, "bad child of parent list")); + return(1); }