summaryrefslogtreecommitdiffstats
path: root/mdoc_action.c
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2009-06-17 14:08:47 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2009-06-17 14:08:47 +0000
commitfaf0f4ffb473b01c18346decdde9edc628919365 (patch)
tree5353c83c4878525be208c898a99aae186ebcad19 /mdoc_action.c
parentc7816e955bad4c17d5247b680ac8db55911b8a53 (diff)
downloadmandoc-faf0f4ffb473b01c18346decdde9edc628919365.tar.gz
`Bl -column' now correctly handles tail entries (Bl -column -more... arg0...).
Diffstat (limited to 'mdoc_action.c')
-rw-r--r--mdoc_action.c51
1 files changed, 51 insertions, 0 deletions
diff --git a/mdoc_action.c b/mdoc_action.c
index 0b7face0..9d8d819d 100644
--- a/mdoc_action.c
+++ b/mdoc_action.c
@@ -51,6 +51,7 @@ static int concat(struct mdoc *, const struct mdoc_node *,
static int post_ar(POST_ARGS);
static int post_bl(POST_ARGS);
+static int post_bl_head(POST_ARGS);
static int post_bl_width(POST_ARGS);
static int post_bl_tagwidth(POST_ARGS);
static int post_dd(POST_ARGS);
@@ -634,10 +635,60 @@ post_bl_width(struct mdoc *m)
static int
+post_bl_head(POST_ARGS)
+{
+ int i, c;
+ struct mdoc_node *n, *nn, *nnp;
+
+ if (NULL == m->last->child)
+ return(1);
+
+ n = m->last->parent;
+ assert(n->args);
+
+ for (c = 0; c < (int)n->args->argc; c++)
+ if (MDOC_Column == n->args->argv[c].arg)
+ break;
+
+ /* Only process -column. */
+
+ if (c == (int)n->args->argc)
+ return(1);
+
+ assert(0 == n->args->argv[c].sz);
+
+ /*
+ * Accomodate for new-style groff column syntax. Shuffle the
+ * child nodes, all of which must be TEXT, as arguments for the
+ * column field. Then, delete the head children.
+ */
+
+ for (i = 0, nn = m->last->child; nn; nn = nn->next, i++)
+ /* Count children. */;
+
+ n->args->argv[c].sz = i;
+ n->args->argv[c].value = malloc(i * sizeof(char *));
+
+ for (i = 0, nn = m->last->child; nn; i++) {
+ n->args->argv[c].value[i] = nn->string;
+ nn->string = NULL;
+ nnp = nn;
+ nn = nn->next;
+ mdoc_node_free(nnp);
+ }
+
+ m->last->child = NULL;
+ return(1);
+}
+
+
+static int
post_bl(POST_ARGS)
{
int i, r, len;
+ if (MDOC_HEAD == m->last->type)
+ return(post_bl_head(m));
if (MDOC_BLOCK != m->last->type)
return(1);