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 oBG0r5Uh015605 for ; Wed, 15 Dec 2010 19:53:05 -0500 (EST) Received: (from kristaps@localhost) by krisdoz.my.domain (8.14.3/8.14.3/Submit) id oBG0r5MR005525; Wed, 15 Dec 2010 19:53:05 -0500 (EST) Date: Wed, 15 Dec 2010 19:53:05 -0500 (EST) Message-Id: <201012160053.oBG0r5MR005525@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: Allow `It' to have a trailing paragraph if the surrounding list X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/ Content-Type: text/plain; charset=utf-8 Log Message: ----------- Allow `It' to have a trailing paragraph if the surrounding list is in compact mode. 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.141 retrieving revision 1.142 diff -Lmdoc_validate.c -Lmdoc_validate.c -u -p -r1.141 -r1.142 --- mdoc_validate.c +++ mdoc_validate.c @@ -144,7 +144,7 @@ static v_post posts_dd[] = { ewarn_ge1, static v_post posts_dl[] = { post_literal, bwarn_ge1, herr_eq0, NULL }; static v_post posts_dt[] = { post_dt, post_prol, NULL }; static v_post posts_fo[] = { hwarn_eq1, bwarn_ge1, NULL }; -static v_post posts_it[] = { post_it, NULL }; +static v_post posts_it[] = { post_ignpar, post_it, NULL }; static v_post posts_lb[] = { eerr_eq1, post_lb, NULL }; static v_post posts_nd[] = { berr_ge1, NULL }; static v_post posts_nm[] = { post_nm, NULL }; @@ -1886,11 +1886,26 @@ post_ignpar(POST_ARGS) if (MDOC_BODY != mdoc->last->type) return(1); - if (NULL != (np = mdoc->last->child)) + /* + * Lists are allowed to have paragraphs as the first macro (I + * have no idea why: it really uglifies things). + */ + + np = mdoc->last->child; + if (NULL != np && MDOC_It != mdoc->last->tok) if (MDOC_Pp == np->tok || MDOC_Lp == np->tok) { mdoc_nmsg(mdoc, np, MANDOCERR_IGNPAR); mdoc_node_delete(mdoc, np); } + + /* + * Compact lists are allowed to have trailing paragraph macros; + * however, nobody else is (including non-compact lists). + */ + + np = mdoc->last; + if (MDOC_It == np->tok && ! np->parent->parent->data.Bl->comp) + return(1); if (NULL != (np = mdoc->last->last)) if (MDOC_Pp == np->tok || MDOC_Lp == np->tok) { -- To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv