=================================================================== RCS file: /cvs/mandoc/Attic/mdoc_action.c,v retrieving revision 1.9 retrieving revision 1.22 diff -u -p -r1.9 -r1.22 --- mandoc/Attic/mdoc_action.c 2009/06/10 20:18:43 1.9 +++ mandoc/Attic/mdoc_action.c 2009/07/06 11:14:03 1.22 @@ -1,4 +1,4 @@ -/* $Id: mdoc_action.c,v 1.9 2009/06/10 20:18:43 kristaps Exp $ */ +/* $Id: mdoc_action.c,v 1.22 2009/07/06 11:14:03 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -24,15 +24,13 @@ #include "libmdoc.h" -enum mwarn { - WBADSEC, - WNOWIDTH, - WBADDATE -}; - enum merr { + EBADDATE, + ENOWIDTH, + EBADSEC, ETOOLONG, EMALLOC, + EUTSNAME, ENUMFMT }; @@ -44,18 +42,19 @@ struct actions { int (*post)(POST_ARGS); }; -static int pwarn(struct mdoc *, int, int, enum mwarn); -static int perr(struct mdoc *, int, int, enum merr); +static int perr(struct mdoc *, int, int, enum merr, int); static int concat(struct mdoc *, const struct mdoc_node *, char *, size_t); 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); static int post_display(POST_ARGS); static int post_dt(POST_ARGS); +static int post_lk(POST_ARGS); static int post_nm(POST_ARGS); static int post_os(POST_ARGS); static int post_prol(POST_ARGS); @@ -65,12 +64,12 @@ static int post_std(POST_ARGS); static int pre_bd(PRE_ARGS); static int pre_dl(PRE_ARGS); -#define vwarn(m, t) pwarn((m), (m)->last->line, (m)->last->pos, (t)) -#define verr(m, t) perr((m), (m)->last->line, (m)->last->pos, (t)) -#define nerr(m, n, t) perr((m), (n)->line, (n)->pos, (t)) +#define vwarn(m, t) perr((m), (m)->last->line, (m)->last->pos, (t), 0) +#define verr(m, t) perr((m), (m)->last->line, (m)->last->pos, (t), 1) +#define nerr(m, n, t) perr((m), (n)->line, (n)->pos, (t), 1) const struct actions mdoc_actions[MDOC_MAX] = { - { NULL, NULL }, /* \" */ + { NULL, NULL }, /* Ap */ { NULL, post_dd }, /* Dd */ { NULL, post_dt }, /* Dt */ { NULL, post_os }, /* Os */ @@ -87,7 +86,7 @@ const struct actions mdoc_actions[MDOC_MAX] = { { NULL, NULL }, /* Ad */ { NULL, NULL }, /* An */ { NULL, post_ar }, /* Ar */ - { NULL, NULL }, /* Cd */ + { NULL, NULL }, /* Cd */ /* FIXME: tabs are accepted! */ { NULL, NULL }, /* Cm */ { NULL, NULL }, /* Dv */ { NULL, NULL }, /* Er */ @@ -177,9 +176,8 @@ const struct actions mdoc_actions[MDOC_MAX] = { { NULL, NULL }, /* Fr */ { NULL, NULL }, /* Ud */ { NULL, NULL }, /* Lb */ - { NULL, NULL }, /* Ap */ { NULL, NULL }, /* Lp */ - { NULL, NULL }, /* Lk */ + { NULL, post_lk }, /* Lk */ { NULL, NULL }, /* Mt */ { NULL, NULL }, /* Brq */ { NULL, NULL }, /* Bro */ @@ -259,11 +257,12 @@ concat(struct mdoc *m, const struct mdoc_node *n, static int -perr(struct mdoc *m, int line, int pos, enum merr type) +perr(struct mdoc *m, int line, int pos, enum merr type, int iserr) { char *p; p = NULL; + switch (type) { case (ENUMFMT): p = "bad number format"; @@ -271,37 +270,28 @@ perr(struct mdoc *m, int line, int pos, enum merr type case (ETOOLONG): p = "argument text too long"; break; + case (EUTSNAME): + p = "utsname"; + break; case (EMALLOC): p = "memory exhausted"; 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; - int c; - - p = NULL; - c = WARN_SYNTAX; - switch (type) { - case (WBADSEC): + case (EBADSEC): p = "inappropriate document section in manual section"; - c = WARN_COMPAT; break; - case (WNOWIDTH): + case (ENOWIDTH): p = "cannot determine default width"; break; - case (WBADDATE): + case (EBADDATE): p = "malformed date syntax"; break; } + assert(p); - return(mdoc_pwarn(m, line, pos, c, p)); + if (iserr) + return(mdoc_perr(m, line, pos, p)); + + return(mdoc_pwarn(m, line, pos, p)); } @@ -386,7 +376,7 @@ post_sh(POST_ARGS) case (9): break; default: - return(vwarn(m, WBADSEC)); + return(vwarn(m, EBADSEC)); } break; default: @@ -504,7 +494,7 @@ post_os(POST_ARGS) if (0 == buf[0]) { if (-1 == uname(&utsname)) - return(mdoc_err(m, "utsname")); + return(verr(m, EUTSNAME)); if (strlcat(buf, utsname.sysname, 64) >= 64) return(verr(m, ETOOLONG)); if (strlcat(buf, " ", 64) >= 64) @@ -515,8 +505,8 @@ post_os(POST_ARGS) if (NULL == (m->meta.os = strdup(buf))) return(verr(m, EMALLOC)); - m->lastnamed = m->lastsec = SEC_BODY; + m->flags |= MDOC_PBODY; return(post_prol(m)); } @@ -537,7 +527,8 @@ post_bl_tagwidth(struct mdoc *m) * width if a macro. */ - if ((n = m->last->body->child)) { + n = m->last->body->child; + if (n) { assert(MDOC_BLOCK == n->type); assert(MDOC_It == n->tok); n = n->head->child; @@ -548,7 +539,7 @@ post_bl_tagwidth(struct mdoc *m) if (n) { if (MDOC_TEXT != n->type) { if (0 == (sz = (int)mdoc_macro2len(n->tok))) - if ( ! vwarn(m, WNOWIDTH)) + if ( ! vwarn(m, ENOWIDTH)) return(0); } else sz = (int)strlen(n->string) + 1; @@ -612,11 +603,11 @@ post_bl_width(struct mdoc *m) */ if (0 == strcmp(p, "Ds")) - width = 8; + width = 6; else if (MDOC_MAX == (tok = mdoc_hash_find(m->htab, p))) return(1); else if (0 == (width = mdoc_macro2len(tok))) - return(vwarn(m, WNOWIDTH)); + return(vwarn(m, ENOWIDTH)); /* The value already exists: free and reallocate it. */ @@ -633,10 +624,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. + */ + + n->args->argv[c].sz = (size_t)m->last->nchild; + n->args->argv[c].value = malloc + ((size_t)m->last->nchild * 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->nchild = 0; + 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); @@ -669,6 +710,27 @@ post_bl(POST_ARGS) static int +post_lk(POST_ARGS) +{ + struct mdoc_node *n; + + if (m->last->child) + return(1); + + n = m->last; + m->next = MDOC_NEXT_CHILD; + /* FIXME: this isn't documented anywhere! */ + if ( ! mdoc_word_alloc(m, m->last->line, + m->last->pos, "~")) + return(0); + + m->last = n; + m->next = MDOC_NEXT_SIBLING; + return(1); +} + + +static int post_ar(POST_ARGS) { struct mdoc_node *n; @@ -702,7 +764,7 @@ post_dd(POST_ARGS) return(0); if (0 == (m->meta.date = mdoc_atotime(buf))) { - if ( ! vwarn(m, WBADDATE)) + if ( ! vwarn(m, EBADDATE)) return(0); m->meta.date = time(NULL); } @@ -746,9 +808,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); }