From: kristaps@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: Allow `It' to have a trailing paragraph if the surrounding list
Date: Wed, 15 Dec 2010 19:53:05 -0500 (EST) [thread overview]
Message-ID: <201012160053.oBG0r5MR005525@krisdoz.my.domain> (raw)
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
reply other threads:[~2010-12-16 0:53 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201012160053.oBG0r5MR005525@krisdoz.my.domain \
--to=kristaps@mdocml.bsd.lv \
--cc=source@mdocml.bsd.lv \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).