summaryrefslogtreecommitdiffstats
path: root/mdoc_macro.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2012-01-05 00:43:51 +0000
committerIngo Schwarze <schwarze@openbsd.org>2012-01-05 00:43:51 +0000
commitb7a4f7bea60ee5bd30a6ec679453b83a3665eff1 (patch)
tree6d47ef7affb0b037a281c56bbb5f0e00e32f3cc0 /mdoc_macro.c
parent4006daa96c9ac968f05d5534dcc1162886063ef9 (diff)
downloadmandoc-b7a4f7bea60ee5bd30a6ec679453b83a3665eff1.tar.gz
Fix previous such that all .It HEADs are unparsed,
not just the first one in each -diag list. While here, drop the needless if-statement and choose a more precise wording for the comment. ok kristaps@
Diffstat (limited to 'mdoc_macro.c')
-rw-r--r--mdoc_macro.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/mdoc_macro.c b/mdoc_macro.c
index add440b3..b539f389 100644
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -994,16 +994,6 @@ blk_full(MACRO_PROT_ARGS)
enum margverr av;
char *p;
- /*
- * Exception: `-diag' lists are not parsed, but lists in general
- * are parsed.
- */
- nparsed = 0;
- if (MDOC_It == tok && NULL != m->last &&
- MDOC_Bl == m->last->tok &&
- LIST_diag == m->last->norm->Bl.type)
- nparsed = 1;
-
nl = MDOC_NEWLINE & m->flags;
/* Close out prior implicit scope. */
@@ -1048,6 +1038,14 @@ blk_full(MACRO_PROT_ARGS)
head = body = NULL;
/*
+ * Exception: Heads of `It' macros in `-diag' lists are not
+ * parsed, even though `It' macros in general are parsed.
+ */
+ nparsed = MDOC_It == tok &&
+ MDOC_Bl == m->last->parent->tok &&
+ LIST_diag == m->last->parent->norm->Bl.type;
+
+ /*
* The `Nd' macro has all arguments in its body: it's a hybrid
* of block partial-explicit and full-implicit. Stupid.
*/