=================================================================== RCS file: /cvs/mandoc/Attic/validate.c,v retrieving revision 1.86 retrieving revision 1.93 diff -u -p -r1.86 -r1.93 --- mandoc/Attic/validate.c 2009/03/20 15:14:01 1.86 +++ mandoc/Attic/validate.c 2009/03/23 14:22:11 1.93 @@ -1,4 +1,4 @@ -/* $Id: validate.c,v 1.86 2009/03/20 15:14:01 kristaps Exp $ */ +/* $Id: validate.c,v 1.93 2009/03/23 14:22:11 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -23,7 +23,7 @@ #include #include -#include "private.h" +#include "libmdoc.h" /* FIXME: .Bl -diag can't have non-text children in HEAD. */ /* TODO: ignoring Pp (it's superfluous in some invocations). */ @@ -216,18 +216,18 @@ const struct valids mdoc_valids[MDOC_MAX] = { { NULL, NULL }, /* Ar */ { pres_cd, posts_text }, /* Cd */ { NULL, NULL }, /* Cm */ - { NULL, posts_text }, /* Dv */ + { NULL, NULL }, /* Dv */ { pres_er, posts_text }, /* Er */ - { NULL, posts_text }, /* Ev */ + { NULL, NULL }, /* Ev */ { pres_ex, posts_ex }, /* Ex */ - { NULL, posts_text }, /* Fa */ + { NULL, NULL }, /* Fa */ { pres_fd, posts_wtext }, /* Fd */ { NULL, NULL }, /* Fl */ { NULL, posts_text }, /* Fn */ { NULL, posts_wtext }, /* Ft */ { NULL, posts_text }, /* Ic */ { NULL, posts_in }, /* In */ - { NULL, posts_text }, /* Li */ + { NULL, NULL }, /* Li */ { NULL, posts_wtext }, /* Nd */ { NULL, posts_nm }, /* Nm */ { NULL, posts_wline }, /* Op */ @@ -235,7 +235,7 @@ const struct valids mdoc_valids[MDOC_MAX] = { { NULL, NULL }, /* Pa */ { pres_rv, posts_rv }, /* Rv */ { NULL, posts_st }, /* St */ - { NULL, posts_text }, /* Va */ + { NULL, NULL }, /* Va */ { NULL, posts_text }, /* Vt */ { NULL, posts_xr }, /* Xr */ { NULL, posts_text }, /* %A */ @@ -265,7 +265,7 @@ const struct valids mdoc_valids[MDOC_MAX] = { { NULL, posts_wline }, /* Dq */ { NULL, NULL }, /* Ec */ { NULL, NULL }, /* Ef */ - { NULL, posts_text }, /* Em */ + { NULL, NULL }, /* Em */ { NULL, NULL }, /* Eo */ { NULL, NULL }, /* Fx */ { NULL, posts_text }, /* Ms */ @@ -315,6 +315,7 @@ const struct valids mdoc_valids[MDOC_MAX] = { { NULL, NULL }, /* Es */ { NULL, NULL }, /* En */ { NULL, NULL }, /* Dx */ + { NULL, posts_text }, /* %Q */ }; @@ -706,7 +707,8 @@ check_text(struct mdoc *mdoc, int line, int pos, const if ('\\' != *p) continue; - if ((c = mdoc_isescape(p))) { + c = mdoc_isescape(p); + if (c) { p += (int)c - 1; continue; } @@ -837,7 +839,8 @@ pre_bl(PRE_ARGS) case (MDOC_Tag): if (-1 != width) break; - return(mdoc_nerr(mdoc, n, "missing %s argument", + return(mdoc_nwarn(mdoc, n, WARN_SYNTAX, + "suggest %s argument", mdoc_argnames[MDOC_Width])); default: break;