=================================================================== RCS file: /cvs/mandoc/Attic/action.c,v retrieving revision 1.45 retrieving revision 1.50 diff -u -p -r1.45 -r1.50 --- mandoc/Attic/action.c 2009/03/20 16:43:28 1.45 +++ mandoc/Attic/action.c 2009/03/23 14:22:11 1.50 @@ -1,4 +1,4 @@ -/* $Id: action.c,v 1.45 2009/03/20 16:43:28 kristaps Exp $ */ +/* $Id: action.c,v 1.50 2009/03/23 14:22:11 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -24,7 +24,7 @@ #include #include -#include "private.h" +#include "libmdoc.h" /* * Actions are executed on macros after they've been post-validated: in @@ -32,10 +32,6 @@ * children have been filled in (post-fix order). */ -enum merr { - ENOWIDTH -}; - enum mwarn { WBADSEC, WNOWIDTH, @@ -51,14 +47,13 @@ struct actions { }; static int pwarn(struct mdoc *, int, int, enum mwarn); -static int perr(struct mdoc *, int, int, enum merr); static int post_ar(POST_ARGS); static int post_bl(POST_ARGS); static int post_bl_width(POST_ARGS); static int post_bl_tagwidth(POST_ARGS); -static int post_bd(POST_ARGS); static int post_dd(POST_ARGS); +static int post_display(POST_ARGS); static int post_dt(POST_ARGS); static int post_nm(POST_ARGS); static int post_os(POST_ARGS); @@ -67,8 +62,8 @@ static int post_sh(POST_ARGS); static int post_std(POST_ARGS); static int pre_bd(PRE_ARGS); +static int pre_dl(PRE_ARGS); -#define merr(m, t) perr((m), (m)->last->line, (m)->last->pos, (t)) #define mwarn(m, t) pwarn((m), (m)->last->line, (m)->last->pos, (t)) const struct actions mdoc_actions[MDOC_MAX] = { @@ -80,8 +75,8 @@ const struct actions mdoc_actions[MDOC_MAX] = { { NULL, NULL }, /* Ss */ { NULL, NULL }, /* Pp */ { NULL, NULL }, /* D1 */ - { NULL, NULL }, /* Dl */ - { pre_bd, post_bd }, /* Bd */ + { pre_dl, post_display }, /* Dl */ + { pre_bd, post_display }, /* Bd */ { NULL, NULL }, /* Ed */ { NULL, post_bl }, /* Bl */ { NULL, NULL }, /* El */ @@ -190,6 +185,7 @@ const struct actions mdoc_actions[MDOC_MAX] = { { NULL, NULL }, /* Es */ { NULL, NULL }, /* En */ { NULL, NULL }, /* Dx */ + { NULL, NULL }, /* %Q */ }; @@ -234,24 +230,6 @@ mdoc_action_post(struct mdoc *m) static int -perr(struct mdoc *m, int line, int pos, enum merr type) -{ - char *p; - - p = NULL; - - switch (type) { - case (ENOWIDTH): - p = "missing width argument"; - break; - } - - assert(p); - return(mdoc_perr(m, line, pos, p)); -} - - -static int pwarn(struct mdoc *m, int line, int pos, enum mwarn type) { char *p; @@ -294,7 +272,10 @@ post_std(POST_ARGS) assert(m->meta.name); - m->last->args->argv[0].value = xcalloc(1, sizeof(char *)); + m->last->args->argv[0].value = calloc(1, sizeof(char *)); + if (NULL == m->last->args->argv[0].value) + err(1, "calloc"); + m->last->args->argv[0].sz = 1; m->last->args->argv[0].value[0] = xstrdup(m->meta.name); return(1); @@ -403,7 +384,8 @@ post_dt(POST_ARGS) * arch = NULL */ - if ((cp = mdoc_a2msec(n->string))) { + cp = mdoc_a2msec(n->string); + if (cp) { m->meta.vol = xstrdup(cp); errno = 0; lval = strtol(n->string, &ep, 10); @@ -422,7 +404,8 @@ post_dt(POST_ARGS) * VOL */ - if ((cp = mdoc_a2vol(n->string))) { + cp = mdoc_a2vol(n->string); + if (cp) { free(m->meta.vol); m->meta.vol = xstrdup(cp); n = n->next; @@ -467,6 +450,10 @@ post_os(POST_ARGS) } +/* + * Calculate the -width for a `Bl -tag' list if it hasn't been provided. + * Uses the first head macro. + */ static int post_bl_tagwidth(struct mdoc *m) { @@ -475,33 +462,22 @@ post_bl_tagwidth(struct mdoc *m) char buf[32]; /* - * If -tag has been specified and -width has not been, then try - * to intuit our width from the first body element. - */ - - if (NULL == (n = m->last->body->child)) - return(1); - - /* * Use the text width, if a text node, or the default macro * width if a macro. */ - if ((n = n->head->child)) { + n = m->last->head->child; + sz = 10; /* Default size. */ + + if (n) { if (MDOC_TEXT != n->type) { if (0 == (sz = (int)mdoc_macro2len(n->tok))) - sz = -1; + if ( ! mwarn(m, WNOWIDTH)) + return(0); } else sz = (int)strlen(n->string) + 1; - } else - sz = -1; + } - if (-1 == sz) { - if ( ! mwarn(m, WNOWIDTH)) - return(0); - sz = 10; - } - (void)snprintf(buf, sizeof(buf), "%dn", sz); /* @@ -509,26 +485,21 @@ post_bl_tagwidth(struct mdoc *m) * We're guaranteed that a MDOC_Width doesn't already exist. */ - if (NULL == m->last->args) { - m->last->args = xcalloc - (1, sizeof(struct mdoc_arg)); - m->last->args->refcnt = 1; - } - n = m->last; - sz = (int)n->args->argc; - - (n->args->argc)++; + assert(n->args); + (n->args->argc)++; n->args->argv = xrealloc(n->args->argv, - n->args->argc * sizeof(struct mdoc_arg)); + n->args->argc * sizeof(struct mdoc_argv)); - n->args->argv[sz - 1].arg = MDOC_Width; - n->args->argv[sz - 1].line = m->last->line; - n->args->argv[sz - 1].pos = m->last->pos; - n->args->argv[sz - 1].sz = 1; - n->args->argv[sz - 1].value = xcalloc(1, sizeof(char *)); - n->args->argv[sz - 1].value[0] = xstrdup(buf); + n->args->argv[n->args->argc - 1].arg = MDOC_Width; + n->args->argv[n->args->argc - 1].line = m->last->line; + n->args->argv[n->args->argc - 1].pos = m->last->pos; + n->args->argv[n->args->argc - 1].sz = 1; + n->args->argv[n->args->argc - 1].value = calloc(1, sizeof(char *)); + if (NULL == n->args->argv[n->args->argc - 1].value) + err(1, "calloc"); + n->args->argv[n->args->argc - 1].value[0] = xstrdup(buf); return(1); } @@ -543,14 +514,14 @@ post_bl_width(struct mdoc *m) char *p; if (NULL == m->last->args) - return(merr(m, ENOWIDTH)); + return(1); for (i = 0; i < (int)m->last->args->argc; i++) if (MDOC_Width == m->last->args->argv[i].arg) break; if (i == (int)m->last->args->argc) - return(merr(m, ENOWIDTH)); + return(1); p = m->last->args->argv[i].value[0]; @@ -686,6 +657,17 @@ post_prol(POST_ARGS) static int +pre_dl(PRE_ARGS) +{ + + if (MDOC_BODY != n->type) + return(1); + m->flags |= MDOC_LITERAL; + return(1); +} + + +static int pre_bd(PRE_ARGS) { int i; @@ -714,7 +696,7 @@ pre_bd(PRE_ARGS) static int -post_bd(POST_ARGS) +post_display(POST_ARGS) { if (MDOC_BODY == m->last->type)