=================================================================== RCS file: /cvs/mandoc/Attic/mdoc_action.c,v retrieving revision 1.1 retrieving revision 1.37 diff -u -p -r1.1 -r1.37 --- mandoc/Attic/mdoc_action.c 2009/03/25 15:36:05 1.1 +++ mandoc/Attic/mdoc_action.c 2009/09/16 20:49:06 1.37 @@ -1,25 +1,22 @@ -/* $Id: mdoc_action.c,v 1.1 2009/03/25 15:36:05 kristaps Exp $ */ +/* $Id: mdoc_action.c,v 1.37 2009/09/16 20:49:06 kristaps Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #include #include -#include #include #include #include @@ -27,48 +24,37 @@ #include "libmdoc.h" -/* - * Actions are executed on macros after they've been post-validated: in - * other words, a macro will not be "acted upon" until all of its - * children have been filled in (post-fix order). - */ - -enum mwarn { - WBADSEC, - WNOWIDTH, - WBADDATE -}; - +#define POST_ARGS struct mdoc *m, struct mdoc_node *n #define PRE_ARGS struct mdoc *m, const struct mdoc_node *n -#define POST_ARGS struct mdoc *m struct actions { int (*pre)(PRE_ARGS); int (*post)(POST_ARGS); }; -static int pwarn(struct mdoc *, int, int, enum mwarn); - static int post_ar(POST_ARGS); +static int post_at(POST_ARGS); static int post_bl(POST_ARGS); -static int post_bl_width(POST_ARGS); +static int post_bl_head(POST_ARGS); static int post_bl_tagwidth(POST_ARGS); +static int post_bl_width(POST_ARGS); static int post_dd(POST_ARGS); static int post_display(POST_ARGS); static int post_dt(POST_ARGS); +static int post_lb(POST_ARGS); static int post_nm(POST_ARGS); static int post_os(POST_ARGS); static int post_prol(POST_ARGS); static int post_sh(POST_ARGS); +static int post_st(POST_ARGS); static int post_std(POST_ARGS); +static int post_tilde(POST_ARGS); static int pre_bd(PRE_ARGS); static int pre_dl(PRE_ARGS); -#define mwarn(m, t) pwarn((m), (m)->last->line, (m)->last->pos, (t)) - -const struct actions mdoc_actions[MDOC_MAX] = { - { NULL, NULL }, /* \" */ +static const struct actions mdoc_actions[MDOC_MAX] = { + { NULL, NULL }, /* Ap */ { NULL, post_dd }, /* Dd */ { NULL, post_dt }, /* Dt */ { NULL, post_os }, /* Os */ @@ -103,9 +89,9 @@ const struct actions mdoc_actions[MDOC_MAX] = { { NULL, post_nm }, /* Nm */ { NULL, NULL }, /* Op */ { NULL, NULL }, /* Ot */ - { NULL, NULL }, /* Pa */ + { NULL, post_tilde }, /* Pa */ { NULL, post_std }, /* Rv */ - { NULL, NULL }, /* St */ + { NULL, post_st }, /* St */ { NULL, NULL }, /* Va */ { NULL, NULL }, /* Vt */ { NULL, NULL }, /* Xr */ @@ -123,7 +109,7 @@ const struct actions mdoc_actions[MDOC_MAX] = { { NULL, NULL }, /* Ac */ { NULL, NULL }, /* Ao */ { NULL, NULL }, /* Aq */ - { NULL, NULL }, /* At */ + { NULL, post_at }, /* At */ { NULL, NULL }, /* Bc */ { NULL, NULL }, /* Bf */ { NULL, NULL }, /* Bo */ @@ -174,10 +160,9 @@ const struct actions mdoc_actions[MDOC_MAX] = { { NULL, NULL }, /* Hf */ { NULL, NULL }, /* Fr */ { NULL, NULL }, /* Ud */ - { NULL, NULL }, /* Lb */ - { NULL, NULL }, /* Ap */ + { NULL, post_lb }, /* Lb */ { NULL, NULL }, /* Lp */ - { NULL, NULL }, /* Lk */ + { NULL, post_tilde }, /* Lk */ { NULL, NULL }, /* Mt */ { NULL, NULL }, /* Brq */ { NULL, NULL }, /* Bro */ @@ -187,24 +172,34 @@ const struct actions mdoc_actions[MDOC_MAX] = { { NULL, NULL }, /* En */ { NULL, NULL }, /* Dx */ { NULL, NULL }, /* %Q */ + { NULL, NULL }, /* br */ + { NULL, NULL }, /* sp */ }; +static int concat(struct mdoc *, const struct mdoc_node *, + char *, size_t); +#ifdef __linux__ +extern size_t strlcat(char *, const char *, size_t); +#endif + + int mdoc_action_pre(struct mdoc *m, const struct mdoc_node *n) { switch (n->type) { case (MDOC_ROOT): - break; + /* FALLTHROUGH */ case (MDOC_TEXT): - break; + return(1); default: - if (NULL == mdoc_actions[m->last->tok].pre) - break; - return((*mdoc_actions[m->last->tok].pre)(m, n)); + break; } - return(1); + + if (NULL == mdoc_actions[n->tok].pre) + return(1); + return((*mdoc_actions[n->tok].pre)(m, n)); } @@ -218,67 +213,53 @@ mdoc_action_post(struct mdoc *m) switch (m->last->type) { case (MDOC_TEXT): - break; + /* FALLTHROUGH */ case (MDOC_ROOT): - break; + return(1); default: - if (NULL == mdoc_actions[m->last->tok].post) - break; - return((*mdoc_actions[m->last->tok].post)(m)); + break; } - return(1); + + if (NULL == mdoc_actions[m->last->tok].post) + return(1); + return((*mdoc_actions[m->last->tok].post)(m, m->last)); } static int -pwarn(struct mdoc *m, int line, int pos, enum mwarn type) +concat(struct mdoc *m, const struct mdoc_node *n, + char *buf, size_t sz) { - char *p; - int c; - p = NULL; - c = WARN_SYNTAX; - - switch (type) { - case (WBADSEC): - p = "inappropriate document section in manual section"; - c = WARN_COMPAT; - break; - case (WNOWIDTH): - p = "cannot determine default width"; - break; - case (WBADDATE): - p = "malformed date syntax"; - break; + for ( ; n; n = n->next) { + assert(MDOC_TEXT == n->type); + if (strlcat(buf, n->string, sz) >= sz) + return(mdoc_nerr(m, n, ETOOLONG)); + if (NULL == n->next) + continue; + if (strlcat(buf, " ", sz) >= sz) + return(mdoc_nerr(m, n, ETOOLONG)); } - assert(p); - return(mdoc_pwarn(m, line, pos, c, p)); + return(1); } static int post_std(POST_ARGS) { + struct mdoc_node *nn; - /* - * If '-std' is invoked without an argument, fill it in with our - * name (if it's been set). - */ - - if (NULL == m->last->args) + if (n->child) return(1); - if (m->last->args->argv[0].sz) - return(1); - + + nn = n; + m->next = MDOC_NEXT_CHILD; assert(m->meta.name); + if ( ! mdoc_word_alloc(m, n->line, n->pos, m->meta.name)) + return(0); + m->last = nn; - 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); } @@ -291,14 +272,93 @@ post_nm(POST_ARGS) if (m->meta.name) return(1); - (void)xstrlcpys(buf, m->last->child, sizeof(buf)); - m->meta.name = xstrdup(buf); + buf[0] = 0; + if ( ! concat(m, n->child, buf, sizeof(buf))) + return(0); + if (NULL == (m->meta.name = strdup(buf))) + return(mdoc_nerr(m, n, EMALLOC)); return(1); } static int +post_lb(POST_ARGS) +{ + const char *p; + char *buf; + size_t sz; + + assert(MDOC_TEXT == n->child->type); + p = mdoc_a2lib(n->child->string); + if (NULL == p) { + sz = strlen(n->child->string) + + 2 + strlen("\\(lqlibrary\\(rq"); + buf = malloc(sz); + if (NULL == buf) + return(mdoc_nerr(m, n, EMALLOC)); + (void)snprintf(buf, sz, "library \\(lq%s\\(rq", + n->child->string); + free(n->child->string); + n->child->string = buf; + return(1); + } + + free(n->child->string); + n->child->string = strdup(p); + if (NULL == n->child->string) + return(mdoc_nerr(m, n, EMALLOC)); + + return(1); +} + + +static int +post_st(POST_ARGS) +{ + const char *p; + + assert(MDOC_TEXT == n->child->type); + p = mdoc_a2st(n->child->string); + assert(p); + free(n->child->string); + n->child->string = strdup(p); + if (NULL == n->child->string) + return(mdoc_nerr(m, n, EMALLOC)); + + return(1); +} + + +static int +post_at(POST_ARGS) +{ + struct mdoc_node *nn; + const char *p; + + if (n->child) { + assert(MDOC_TEXT == n->child->type); + p = mdoc_a2att(n->child->string); + assert(p); + free(n->child->string); + n->child->string = strdup(p); + if (NULL == n->child->string) + return(mdoc_nerr(m, n, EMALLOC)); + return(1); + } + + nn = n; + m->next = MDOC_NEXT_CHILD; + + if ( ! mdoc_word_alloc(m, nn->line, nn->pos, "AT&T UNIX")) + return(0); + m->last = nn; + + return(1); +} + + +static int post_sh(POST_ARGS) { enum mdoc_sec sec; @@ -310,10 +370,12 @@ post_sh(POST_ARGS) * check ordering. */ - if (MDOC_HEAD != m->last->type) + if (MDOC_HEAD != n->type) return(1); - (void)xstrlcpys(buf, m->last->child, sizeof(buf)); + buf[0] = 0; + if ( ! concat(m, n->child, buf, sizeof(buf))) + return(0); if (SEC_CUSTOM != (sec = mdoc_atosec(buf))) m->lastnamed = sec; @@ -329,7 +391,7 @@ post_sh(POST_ARGS) case (9): break; default: - return(mwarn(m, WBADSEC)); + return(mdoc_nwarn(m, n, EBADSEC)); } break; default: @@ -342,7 +404,7 @@ post_sh(POST_ARGS) static int post_dt(POST_ARGS) { - struct mdoc_node *n; + struct mdoc_node *nn; const char *cp; char *ep; long lval; @@ -361,21 +423,25 @@ post_dt(POST_ARGS) * --> title = unknown, volume = local, msec = 0, arch = NULL */ - if (NULL == (n = m->last->child)) { - m->meta.title = xstrdup("unknown"); - m->meta.vol = xstrdup("local"); - return(post_prol(m)); + if (NULL == (nn = n->child)) { + if (NULL == (m->meta.title = strdup("unknown"))) + return(mdoc_nerr(m, n, EMALLOC)); + if (NULL == (m->meta.vol = strdup("local"))) + return(mdoc_nerr(m, n, EMALLOC)); + return(post_prol(m, n)); } /* Handles: `.Dt TITLE' * --> title = TITLE, volume = local, msec = 0, arch = NULL */ - m->meta.title = xstrdup(n->string); + if (NULL == (m->meta.title = strdup(nn->string))) + return(mdoc_nerr(m, n, EMALLOC)); - if (NULL == (n = n->next)) { - m->meta.vol = xstrdup("local"); - return(post_prol(m)); + if (NULL == (nn = nn->next)) { + if (NULL == (m->meta.vol = strdup("local"))) + return(mdoc_nerr(m, n, EMALLOC)); + return(post_prol(m, n)); } /* Handles: `.Dt TITLE SEC' @@ -385,18 +451,19 @@ post_dt(POST_ARGS) * arch = NULL */ - cp = mdoc_a2msec(n->string); + cp = mdoc_a2msec(nn->string); if (cp) { - m->meta.vol = xstrdup(cp); + if (NULL == (m->meta.vol = strdup(cp))) + return(mdoc_nerr(m, n, EMALLOC)); errno = 0; - lval = strtol(n->string, &ep, 10); - if (n->string[0] != '\0' && *ep == '\0') + lval = strtol(nn->string, &ep, 10); + if (nn->string[0] != '\0' && *ep == '\0') m->meta.msec = (int)lval; - } else - m->meta.vol = xstrdup(n->string); + } else if (NULL == (m->meta.vol = strdup(nn->string))) + return(mdoc_nerr(m, n, EMALLOC)); - if (NULL == (n = n->next)) - return(post_prol(m)); + if (NULL == (nn = nn->next)) + return(post_prol(m, n)); /* Handles: `.Dt TITLE SEC VOL' * --> title = TITLE, volume = VOL is vol ? @@ -405,23 +472,24 @@ post_dt(POST_ARGS) * VOL */ - cp = mdoc_a2vol(n->string); + cp = mdoc_a2vol(nn->string); if (cp) { free(m->meta.vol); - m->meta.vol = xstrdup(cp); - n = n->next; + if (NULL == (m->meta.vol = strdup(cp))) + return(mdoc_nerr(m, n, EMALLOC)); } else { - cp = mdoc_a2arch(n->string); + cp = mdoc_a2arch(nn->string); if (NULL == cp) { free(m->meta.vol); - m->meta.vol = xstrdup(n->string); - } else - m->meta.arch = xstrdup(cp); + if (NULL == (m->meta.vol = strdup(nn->string))) + return(mdoc_nerr(m, n, EMALLOC)); + } else if (NULL == (m->meta.arch = strdup(cp))) + return(mdoc_nerr(m, n, EMALLOC)); } /* Ignore any subsequent parameters... */ - return(post_prol(m)); + return(post_prol(m, n)); } @@ -434,20 +502,25 @@ post_os(POST_ARGS) if (m->meta.os) free(m->meta.os); - (void)xstrlcpys(buf, m->last->child, sizeof(buf)); + buf[0] = 0; + if ( ! concat(m, n->child, buf, sizeof(buf))) + return(0); if (0 == buf[0]) { if (-1 == uname(&utsname)) - return(mdoc_err(m, "utsname")); - (void)xstrlcpy(buf, utsname.sysname, sizeof(buf)); - (void)xstrlcat(buf, " ", sizeof(buf)); - (void)xstrlcat(buf, utsname.release, sizeof(buf)); + return(mdoc_nerr(m, n, EUTSNAME)); + if (strlcat(buf, utsname.sysname, 64) >= 64) + return(mdoc_nerr(m, n, ETOOLONG)); + if (strlcat(buf, " ", 64) >= 64) + return(mdoc_nerr(m, n, ETOOLONG)); + if (strlcat(buf, utsname.release, 64) >= 64) + return(mdoc_nerr(m, n, ETOOLONG)); } - m->meta.os = xstrdup(buf); - m->lastnamed = m->lastsec = SEC_BODY; + if (NULL == (m->meta.os = strdup(buf))) + return(mdoc_nerr(m, n, EMALLOC)); - return(post_prol(m)); + return(post_prol(m, n)); } @@ -456,9 +529,9 @@ post_os(POST_ARGS) * Uses the first head macro. */ static int -post_bl_tagwidth(struct mdoc *m) +post_bl_tagwidth(POST_ARGS) { - struct mdoc_node *n; + struct mdoc_node *nn; int sz; char buf[32]; @@ -467,99 +540,159 @@ post_bl_tagwidth(struct mdoc *m) * width if a macro. */ - if ((n = m->last->body->child)) { - assert(MDOC_BLOCK == n->type); - assert(MDOC_It == n->tok); - n = n->head->child; + nn = n->body->child; + if (nn) { + assert(MDOC_BLOCK == nn->type); + assert(MDOC_It == nn->tok); + nn = nn->head->child; } sz = 10; /* Default size. */ - if (n) { - if (MDOC_TEXT != n->type) { - if (0 == (sz = (int)mdoc_macro2len(n->tok))) - if ( ! mwarn(m, WNOWIDTH)) + if (nn) { + if (MDOC_TEXT != nn->type) { + if (0 == (sz = (int)mdoc_macro2len(nn->tok))) + if ( ! mdoc_nwarn(m, n, ENOWIDTH)) return(0); } else - sz = (int)strlen(n->string) + 1; + sz = (int)strlen(nn->string) + 1; } - (void)snprintf(buf, sizeof(buf), "%dn", sz); + if (-1 == snprintf(buf, sizeof(buf), "%dn", sz)) + return(mdoc_nerr(m, n, ENUMFMT)); /* * We have to dynamically add this to the macro's argument list. * We're guaranteed that a MDOC_Width doesn't already exist. */ - n = m->last; - assert(n->args); + nn = n; + assert(nn->args); + sz = (int)(nn->args->argc)++; - sz = (int)(n->args->argc)++; - n->args->argv = xrealloc(n->args->argv, - n->args->argc * sizeof(struct mdoc_argv)); + nn->args->argv = realloc(nn->args->argv, + nn->args->argc * sizeof(struct mdoc_argv)); - n->args->argv[sz].arg = MDOC_Width; - n->args->argv[sz].line = m->last->line; - n->args->argv[sz].pos = m->last->pos; - n->args->argv[sz].sz = 1; - n->args->argv[sz].value = calloc(1, sizeof(char *)); - if (NULL == n->args->argv[sz].value) - err(1, "calloc"); - n->args->argv[sz].value[0] = xstrdup(buf); + if (NULL == nn->args->argv) + return(mdoc_nerr(m, n, EMALLOC)); + nn->args->argv[sz].arg = MDOC_Width; + nn->args->argv[sz].line = n->line; + nn->args->argv[sz].pos = n->pos; + nn->args->argv[sz].sz = 1; + nn->args->argv[sz].value = calloc(1, sizeof(char *)); + + if (NULL == nn->args->argv[sz].value) + return(mdoc_nerr(m, n, EMALLOC)); + if (NULL == (nn->args->argv[sz].value[0] = strdup(buf))) + return(mdoc_nerr(m, n, EMALLOC)); + return(1); } static int -post_bl_width(struct mdoc *m) +post_bl_width(POST_ARGS) { size_t width; int i, tok; char buf[32]; char *p; - if (NULL == m->last->args) + if (NULL == n->args) return(1); - for (i = 0; i < (int)m->last->args->argc; i++) - if (MDOC_Width == m->last->args->argv[i].arg) + for (i = 0; i < (int)n->args->argc; i++) + if (MDOC_Width == n->args->argv[i].arg) break; - if (i == (int)m->last->args->argc) + if (i == (int)n->args->argc) return(1); + p = n->args->argv[i].value[0]; - p = m->last->args->argv[i].value[0]; - /* * If the value to -width is a macro, then we re-write it to be * the macro's width as set in share/tmac/mdoc/doc-common. */ - if (xstrcmp(p, "Ds")) - width = 8; - else if (MDOC_MAX == (tok = mdoc_tokhash_find(m->htab, p))) + if (0 == strcmp(p, "Ds")) + width = 6; + else if (MDOC_MAX == (tok = mdoc_hash_find(p))) return(1); else if (0 == (width = mdoc_macro2len(tok))) - return(mwarn(m, WNOWIDTH)); + return(mdoc_nwarn(m, n, ENOWIDTH)); /* The value already exists: free and reallocate it. */ - (void)snprintf(buf, sizeof(buf), "%zun", width); + if (-1 == snprintf(buf, sizeof(buf), "%zun", width)) + return(mdoc_nerr(m, n, ENUMFMT)); - free(m->last->args->argv[i].value[0]); - m->last->args->argv[i].value[0] = xstrdup(buf); + free(n->args->argv[i].value[0]); + n->args->argv[i].value[0] = strdup(buf); + if (NULL == n->args->argv[i].value[0]) + return(mdoc_nerr(m, n, EMALLOC)); return(1); } +/* ARGSUSED */ static int +post_bl_head(POST_ARGS) +{ + int i, c; + struct mdoc_node *np, *nn, *nnp; + + if (NULL == n->child) + return(1); + + np = n->parent; + assert(np->args); + + for (c = 0; c < (int)np->args->argc; c++) + if (MDOC_Column == np->args->argv[c].arg) + break; + + /* Only process -column. */ + + if (c == (int)np->args->argc) + return(1); + + assert(0 == np->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. + */ + + np->args->argv[c].sz = (size_t)n->nchild; + np->args->argv[c].value = malloc + ((size_t)n->nchild * sizeof(char *)); + + for (i = 0, nn = n->child; nn; i++) { + np->args->argv[c].value[i] = nn->string; + nn->string = NULL; + nnp = nn; + nn = nn->next; + mdoc_node_free(nnp); + } + + n->nchild = 0; + n->child = NULL; + + return(1); +} + + +static int post_bl(POST_ARGS) { int i, r, len; - if (MDOC_BLOCK != m->last->type) + if (MDOC_HEAD == n->type) + return(post_bl_head(m, n)); + if (MDOC_BLOCK != n->type) return(1); /* @@ -570,20 +703,20 @@ post_bl(POST_ARGS) * rewritten into real lengths). */ - len = (int)(m->last->args ? m->last->args->argc : 0); + len = (int)(n->args ? n->args->argc : 0); for (r = i = 0; i < len; i++) { - if (MDOC_Tag == m->last->args->argv[i].arg) + if (MDOC_Tag == n->args->argv[i].arg) r |= 1 << 0; - if (MDOC_Width == m->last->args->argv[i].arg) + if (MDOC_Width == n->args->argv[i].arg) r |= 1 << 1; } if (r & (1 << 0) && ! (r & (1 << 1))) { - if ( ! post_bl_tagwidth(m)) + if ( ! post_bl_tagwidth(m, n)) return(0); } else if (r & (1 << 1)) - if ( ! post_bl_width(m)) + if ( ! post_bl_width(m, n)) return(0); return(1); @@ -591,25 +724,41 @@ post_bl(POST_ARGS) static int +post_tilde(POST_ARGS) +{ + struct mdoc_node *np; + + if (n->child) + return(1); + + np = n; + m->next = MDOC_NEXT_CHILD; + + /* XXX: not documented for `Lk'. */ + if ( ! mdoc_word_alloc(m, n->line, n->pos, "~")) + return(0); + m->last = np; + + return(1); +} + + +static int post_ar(POST_ARGS) { - struct mdoc_node *n; + struct mdoc_node *np; - if (m->last->child) + if (n->child) return(1); - n = m->last; + np = n; m->next = MDOC_NEXT_CHILD; - if ( ! mdoc_word_alloc(m, m->last->line, - m->last->pos, "file")) + if ( ! mdoc_word_alloc(m, n->line, n->pos, "file")) return(0); - m->next = MDOC_NEXT_SIBLING; - if ( ! mdoc_word_alloc(m, m->last->line, - m->last->pos, "...")) + if ( ! mdoc_word_alloc(m, n->line, n->pos, "...")) return(0); + m->last = np; - m->last = n; - m->next = MDOC_NEXT_SIBLING; return(1); } @@ -619,45 +768,48 @@ post_dd(POST_ARGS) { char buf[64]; - (void)xstrlcpys(buf, m->last->child, sizeof(buf)); + buf[0] = 0; + if ( ! concat(m, n->child, buf, sizeof(buf))) + return(0); if (0 == (m->meta.date = mdoc_atotime(buf))) { - if ( ! mwarn(m, WBADDATE)) + if ( ! mdoc_nwarn(m, n, EBADDATE)) return(0); m->meta.date = time(NULL); } - return(post_prol(m)); + return(post_prol(m, n)); } static int post_prol(POST_ARGS) { - struct mdoc_node *n; + struct mdoc_node *np; - /* - * The end document shouldn't have the prologue macros as part - * of the syntax tree (they encompass only meta-data). - */ + /* Remove prologue macros from AST. */ - if (m->last->parent->child == m->last) - m->last->parent->child = m->last->prev; - if (m->last->prev) - m->last->prev->next = NULL; + if (n->parent->child == n) + n->parent->child = n->prev; + if (n->prev) + n->prev->next = NULL; - n = m->last; - assert(NULL == m->last->next); + np = n; + assert(NULL == n->next); - if (m->last->prev) { - m->last = m->last->prev; + if (n->prev) { + m->last = n->prev; m->next = MDOC_NEXT_SIBLING; } else { - m->last = m->last->parent; + m->last = n->parent; m->next = MDOC_NEXT_CHILD; } - mdoc_node_freelist(n); + mdoc_node_freelist(np); + + if (m->meta.title && m->meta.date && m->meta.os) + m->flags |= MDOC_PBODY; + return(1); } @@ -666,9 +818,8 @@ static int pre_dl(PRE_ARGS) { - if (MDOC_BODY != n->type) - return(1); - m->flags |= MDOC_LITERAL; + if (MDOC_BODY == n->type) + m->flags |= MDOC_LITERAL; return(1); } @@ -681,14 +832,14 @@ pre_bd(PRE_ARGS) if (MDOC_BODY != n->type) return(1); + /* Enter literal context if `Bd -literal' or `-unfilled'. */ + /* - * We ONLY enter a literal context if `Bd -literal' or `Bd - * -unfilled'. + * TODO: `-offset' without an argument should be the width of + * the literal "". */ - n = n->parent; - - for (i = 0; i < (int)n->args->argc; i++) + for (n = n->parent, i = 0; i < (int)n->args->argc; i++) if (MDOC_Literal == n->args->argv[i].arg) break; else if (MDOC_Unfilled == n->args->argv[i].arg) @@ -705,7 +856,7 @@ static int post_display(POST_ARGS) { - if (MDOC_BODY == m->last->type) + if (MDOC_BODY == n->type) m->flags &= ~MDOC_LITERAL; return(1); }