From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from krisdoz.my.domain (kristaps@localhost [127.0.0.1]) by krisdoz.my.domain (8.14.3/8.14.3) with ESMTP id oBG0PZfx012363 for ; Wed, 15 Dec 2010 19:25:35 -0500 (EST) Received: (from kristaps@localhost) by krisdoz.my.domain (8.14.3/8.14.3/Submit) id oBG0PZeE023827; Wed, 15 Dec 2010 19:25:35 -0500 (EST) Date: Wed, 15 Dec 2010 19:25:35 -0500 (EST) Message-Id: <201012160025.oBG0PZeE023827@krisdoz.my.domain> X-Mailinglist: mdocml-source Reply-To: source@mdocml.bsd.lv MIME-Version: 1.0 From: kristaps@mdocml.bsd.lv To: source@mdocml.bsd.lv Subject: mdocml: First, make `Pp' (next to `Sm') be allowed as the first element X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/ Content-Type: text/plain; charset=utf-8 Log Message: ----------- First, make `Pp' (next to `Sm') be allowed as the first element of a `Bl' (before any `It' have been invoked). Next, have the existence of either macro raise a warning, as it's technically not legal according to mdoc.7. Second, delete any `Pp' as the first element of a `Bl' (i.e., before an `It') ONLY when -compact has not been specified. This matches with the latest version of groff. This deletion happens prior to the above check, so double-warnings will not be issued. Modified Files: -------------- mdocml: mdoc_validate.c Revision Data ------------- Index: mdoc_validate.c =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mdoc_validate.c,v retrieving revision 1.140 retrieving revision 1.141 diff -Lmdoc_validate.c -Lmdoc_validate.c -u -p -r1.140 -r1.141 --- mdoc_validate.c +++ mdoc_validate.c @@ -170,7 +170,7 @@ static v_pre pres_dd[] = { pre_dd, NULL static v_pre pres_dt[] = { pre_dt, NULL }; static v_pre pres_er[] = { NULL, NULL }; static v_pre pres_fd[] = { NULL, NULL }; -static v_pre pres_it[] = { pre_it, NULL }; +static v_pre pres_it[] = { pre_it, pre_par, NULL }; static v_pre pres_os[] = { pre_os, NULL }; static v_pre pres_pp[] = { pre_par, NULL }; static v_pre pres_sh[] = { pre_sh, NULL }; @@ -1564,21 +1564,20 @@ post_bl(POST_ARGS) return(post_bl_block(mdoc)); if (MDOC_BODY != mdoc->last->type) return(1); - if (NULL == mdoc->last->child) - return(1); - /* - * We only allow certain children of `Bl'. This is usually on - * `It', but apparently `Sm' occurs here and there, so we let - * that one through, too. - */ - - /* LINTED */ for (n = mdoc->last->child; n; n = n->next) { - if (MDOC_BLOCK == n->type && MDOC_It == n->tok) + switch (n->tok) { + case (MDOC_It): continue; - if (MDOC_Sm == n->tok) + case (MDOC_Sm): + /* FALLTHROUGH */ + case (MDOC_Pp): + mdoc_nmsg(mdoc, n, MANDOCERR_CHILD); continue; + default: + break; + } + mdoc_nmsg(mdoc, n, MANDOCERR_SYNTCHILD); return(0); } @@ -1908,6 +1907,8 @@ pre_par(PRE_ARGS) if (NULL == mdoc->last) return(1); + if (MDOC_ELEM != n->type && MDOC_BLOCK != n->type) + return(1); /* * Don't allow prior `Lp' or `Pp' prior to a paragraph-type @@ -1916,10 +1917,11 @@ pre_par(PRE_ARGS) if (MDOC_Pp != mdoc->last->tok && MDOC_Lp != mdoc->last->tok) return(1); - if (MDOC_Bl == n->tok && n->data.Bl->comp) return(1); if (MDOC_Bd == n->tok && n->data.Bd->comp) + return(1); + if (MDOC_It == n->tok && n->parent->data.Bl->comp) return(1); mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNPAR); -- To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv