summaryrefslogtreecommitdiffstats
path: root/mdoc.c
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2010-05-31 20:14:10 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2010-05-31 20:14:10 +0000
commit2ed520ef0116f227a4e219a833990f4b42bb524b (patch)
tree8bd3428e12902772c6ee7e551ef98e0717c54cfe /mdoc.c
parent7dcb39bda3829c02e25af335e95631edef2a260b (diff)
downloadmandoc-2ed520ef0116f227a4e219a833990f4b42bb524b.tar.gz
Macro lines now infer an `It' if they immediately follow a `Bl -column'
or a closed-out `It' block within a `Bl -column' (which only happens when a macro or free-form text is encountered prior to an `It'). Added some regression tests for this behaviour.
Diffstat (limited to 'mdoc.c')
-rw-r--r--mdoc.c65
1 files changed, 55 insertions, 10 deletions
diff --git a/mdoc.c b/mdoc.c
index 1b7a1953..d23aea6a 100644
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,6 +1,6 @@
/* $Id$ */
/*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -561,14 +561,15 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
n = m->last;
/*
- * Diver directly into list processing if we're encountering a
+ * Divert directly to list processing if we're encountering a
* columnar MDOC_BLOCK with or without a prior MDOC_BLOCK entry
- * (if it's a MDOC_BODY that means it's open, in which case we
- * should process within its context).
+ * (a MDOC_BODY means it's already open, in which case we should
+ * process within its context in the normal way).
*/
if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&
LIST_column == n->data.list) {
+ /* `Bl' is open without any children. */
m->flags |= MDOC_FREECOL;
return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf));
}
@@ -577,6 +578,7 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
NULL != n->parent &&
MDOC_Bl == n->parent->tok &&
LIST_column == n->parent->data.list) {
+ /* `Bl' has block-level `It' children. */
m->flags |= MDOC_FREECOL;
return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf));
}
@@ -677,6 +679,7 @@ macrowarn(struct mdoc *m, int ln, const char *buf, int offs)
buf, strlen(buf) > 3 ? "..." : "");
/* FIXME: logic should be in driver. */
+ /* FIXME: broken, will error out and not omit a message. */
return(MDOC_IGN_MACRO & m->pflags ? rc : 0);
}
@@ -688,9 +691,10 @@ macrowarn(struct mdoc *m, int ln, const char *buf, int offs)
int
mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
{
- enum mdoct tok;
- int i, j, sv;
- char mac[5];
+ enum mdoct tok;
+ int i, j, sv;
+ char mac[5];
+ struct mdoc_node *n;
/* Empty lines are ignored. */
@@ -758,10 +762,51 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
if ( ! mdoc_pmsg(m, ln, i - 1, MANDOCERR_EOLNSPACE))
goto err;
- /*
- * Begin recursive parse sequence. Since we're at the start of
- * the line, we don't need to do callable/parseable checks.
+ /*
+ * If an initial macro or a list invocation, divert directly
+ * into macro processing.
+ */
+
+ if (NULL == m->last || MDOC_It == tok || MDOC_El == tok) {
+ if ( ! mdoc_macro(m, tok, ln, sv, &i, buf))
+ goto err;
+ return(1);
+ }
+
+ n = m->last;
+ assert(m->last);
+
+ /*
+ * If the first macro of a `Bl -column', open an `It' block
+ * context around the parsed macro.
+ */
+
+ if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&
+ LIST_column == n->data.list) {
+ m->flags |= MDOC_FREECOL;
+ if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf))
+ goto err;
+ return(1);
+ }
+
+ /*
+ * If we're following a block-level `It' within a `Bl -column'
+ * context (perhaps opened in the above block or in ptext()),
+ * then open an `It' block context around the parsed macro.
*/
+
+ if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&
+ NULL != n->parent &&
+ MDOC_Bl == n->parent->tok &&
+ LIST_column == n->parent->data.list) {
+ m->flags |= MDOC_FREECOL;
+ if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf))
+ goto err;
+ return(1);
+ }
+
+ /* Normal processing of a macro. */
+
if ( ! mdoc_macro(m, tok, ln, sv, &i, buf))
goto err;