=================================================================== RCS file: /cvs/mandoc/mdoc.c,v retrieving revision 1.52 retrieving revision 1.254 diff -u -p -r1.52 -r1.254 --- mandoc/mdoc.c 2009/03/06 14:13:47 1.52 +++ mandoc/mdoc.c 2015/10/12 00:08:15 1.254 @@ -1,51 +1,43 @@ -/* $Id: mdoc.c,v 1.52 2009/03/06 14:13:47 kristaps Exp $ */ +/* $Id: mdoc.c,v 1.254 2015/10/12 00:08:15 schwarze Exp $ */ /* - * Copyright (c) 2008 Kristaps Dzonsons + * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons + * Copyright (c) 2010, 2012-2015 Ingo Schwarze * * 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 AUTHORS DISCLAIM ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS 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 "config.h" + +#include + #include #include -#include #include -#include #include +#include #include +#include -#include "private.h" +#include "mandoc_aux.h" +#include "mandoc.h" +#include "roff.h" +#include "mdoc.h" +#include "libmandoc.h" +#include "roff_int.h" +#include "libmdoc.h" -/* - * Main caller in the libmdoc library. This begins the parsing routine, - * handles allocation of data, and so forth. Most of the "work" is done - * in macro.c and validate.c. - */ - -static struct mdoc_arg *argdup(size_t, const struct mdoc_arg *); -static void argfree(size_t, struct mdoc_arg *); -static void argcpy(struct mdoc_arg *, - const struct mdoc_arg *); - -static struct mdoc_node *mdoc_node_alloc(const struct mdoc *); -static int mdoc_node_append(struct mdoc *, - struct mdoc_node *); -static void mdoc_elem_free(struct mdoc_elem *); -static void mdoc_text_free(struct mdoc_text *); - - -const char *const __mdoc_macronames[MDOC_MAX] = { - "\\\"", "Dd", "Dt", "Os", +const char *const __mdoc_macronames[MDOC_MAX + 1] = { + "text", + "Ap", "Dd", "Dt", "Os", "Sh", "Ss", "Pp", "D1", "Dl", "Bd", "Ed", "Bl", "El", "It", "Ad", "An", @@ -55,12 +47,9 @@ const char *const __mdoc_macronames[MDOC_MAX] = { "Ic", "In", "Li", "Nd", "Nm", "Op", "Ot", "Pa", "Rv", "St", "Va", "Vt", - /* LINTED */ - "Xr", "\%A", "\%B", "\%D", - /* LINTED */ - "\%I", "\%J", "\%N", "\%O", - /* LINTED */ - "\%P", "\%R", "\%T", "\%V", + "Xr", "%A", "%B", "%D", + "%I", "%J", "%N", "%O", + "%P", "%R", "%T", "%V", "Ac", "Ao", "Aq", "At", "Bc", "Bf", "Bo", "Bq", "Bsx", "Bx", "Db", "Dc", @@ -74,572 +63,435 @@ const char *const __mdoc_macronames[MDOC_MAX] = { "Tn", "Ux", "Xc", "Xo", "Fo", "Fc", "Oo", "Oc", "Bk", "Ek", "Bt", "Hf", - "Fr", "Ud", "Lb", - }; + "Fr", "Ud", "Lb", "Lp", + "Lk", "Mt", "Brq", "Bro", + "Brc", "%C", "Es", "En", + "Dx", "%Q", "br", "sp", + "%U", "Ta", "ll", +}; -const char *const __mdoc_argnames[MDOC_ARG_MAX] = { +const char *const __mdoc_argnames[MDOC_ARG_MAX] = { "split", "nosplit", "ragged", - "unfilled", "literal", "file", - "offset", "bullet", "dash", - "hyphen", "item", "enum", - "tag", "diag", "hang", - "ohang", "inset", "column", - "width", "compact", "std", + "unfilled", "literal", "file", + "offset", "bullet", "dash", + "hyphen", "item", "enum", + "tag", "diag", "hang", + "ohang", "inset", "column", + "width", "compact", "std", "filled", "words", "emphasis", - "symbolic" + "symbolic", "nested", "centered" }; -const char * const *mdoc_macronames = __mdoc_macronames; +const char * const *mdoc_macronames = __mdoc_macronames + 1; const char * const *mdoc_argnames = __mdoc_argnames; +static int mdoc_ptext(struct roff_man *, int, char *, int); +static int mdoc_pmacro(struct roff_man *, int, char *, int); -const struct mdoc_node * -mdoc_node(const struct mdoc *mdoc) -{ - return(mdoc->first); -} - - -const struct mdoc_meta * -mdoc_meta(const struct mdoc *mdoc) -{ - - return(&mdoc->meta); -} - - -void -mdoc_free(struct mdoc *mdoc) -{ - - if (mdoc->first) - mdoc_node_freelist(mdoc->first); - if (mdoc->htab) - mdoc_tokhash_free(mdoc->htab); - if (mdoc->meta.title) - free(mdoc->meta.title); - if (mdoc->meta.os) - free(mdoc->meta.os); - if (mdoc->meta.name) - free(mdoc->meta.name); - if (mdoc->meta.arch) - free(mdoc->meta.arch); - if (mdoc->meta.vol) - free(mdoc->meta.vol); - - free(mdoc); -} - - -struct mdoc * -mdoc_alloc(void *data, const struct mdoc_cb *cb) -{ - struct mdoc *p; - - p = xcalloc(1, sizeof(struct mdoc)); - - p->data = data; - if (cb) - (void)memcpy(&p->cb, cb, sizeof(struct mdoc_cb)); - - p->last = xcalloc(1, sizeof(struct mdoc_node)); - p->last->type = MDOC_ROOT; - p->first = p->last; - - p->next = MDOC_NEXT_CHILD; - p->htab = mdoc_tokhash_alloc(); - - return(p); -} - - -int -mdoc_endparse(struct mdoc *mdoc) -{ - - if (MDOC_HALT & mdoc->flags) - return(0); - if (NULL == mdoc->first) - return(1); - - assert(mdoc->last); - if ( ! macro_end(mdoc)) { - mdoc->flags |= MDOC_HALT; - return(0); - } - return(1); -} - - /* - * Main line-parsing routine. If the line is a macro-line (started with - * a '.' control character), then pass along to the parser, which parses - * subsequent macros until the end of line. If normal text, simply - * append the entire line to the chain. + * Main parse routine. Parses a single line -- really just hands off to + * the macro (mdoc_pmacro()) or text parser (mdoc_ptext()). */ int -mdoc_parseln(struct mdoc *mdoc, int line, char *buf) +mdoc_parseln(struct roff_man *mdoc, int ln, char *buf, int offs) { - int c, i; - char tmp[5]; - if (MDOC_HALT & mdoc->flags) - return(0); + if (mdoc->last->type != ROFFT_EQN || ln > mdoc->last->line) + mdoc->flags |= MDOC_NEWLINE; - mdoc->linetok = 0; - - if ('.' != *buf) { - /* - * Free-form text. Not allowed in the prologue. - */ - if (SEC_PROLOGUE == mdoc->lastnamed) - return(mdoc_perr(mdoc, line, 0, - "no text in prologue")); - - if ( ! mdoc_word_alloc(mdoc, line, 0, buf)) - return(0); - mdoc->next = MDOC_NEXT_SIBLING; - return(1); - } - /* - * Control-character detected. Begin the parsing sequence. + * Let the roff nS register switch SYNOPSIS mode early, + * such that the parser knows at all times + * whether this mode is on or off. + * Note that this mode is also switched by the Sh macro. */ + if (roff_getreg(mdoc->roff, "nS")) + mdoc->flags |= MDOC_SYNOPSIS; + else + mdoc->flags &= ~MDOC_SYNOPSIS; - if (buf[1] && '\\' == buf[1]) - if (buf[2] && '\"' == buf[2]) - return(1); - - i = 1; - while (buf[i] && ! isspace((u_char)buf[i]) && - i < (int)sizeof(tmp)) - i++; - - if (i == (int)sizeof(tmp)) { - mdoc->flags |= MDOC_HALT; - return(mdoc_perr(mdoc, line, 1, "unknown macro")); - } else if (i <= 2) { - mdoc->flags |= MDOC_HALT; - return(mdoc_perr(mdoc, line, 1, "unknown macro")); - } - - i--; - - (void)memcpy(tmp, buf + 1, (size_t)i); - tmp[i++] = 0; - - if (MDOC_MAX == (c = mdoc_find(mdoc, tmp))) { - mdoc->flags |= MDOC_HALT; - return(mdoc_perr(mdoc, line, 1, "unknown macro")); - } - - while (buf[i] && isspace((u_char)buf[i])) - i++; - - if ( ! mdoc_macro(mdoc, c, line, 1, &i, buf)) { - mdoc->flags |= MDOC_HALT; - return(0); - } - - return(1); + return roff_getcontrol(mdoc->roff, buf, &offs) ? + mdoc_pmacro(mdoc, ln, buf, offs) : + mdoc_ptext(mdoc, ln, buf, offs); } - void -mdoc_vmsg(struct mdoc *mdoc, int ln, int pos, const char *fmt, ...) +mdoc_macro(MACRO_PROT_ARGS) { - char buf[256]; - va_list ap; + assert(tok > TOKEN_NONE && tok < MDOC_MAX); - if (NULL == mdoc->cb.mdoc_msg) - return; - - va_start(ap, fmt); - (void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap); - va_end(ap); - (*mdoc->cb.mdoc_msg)(mdoc->data, ln, pos, buf); + if (mdoc->flags & MDOC_PBODY) { + if (tok == MDOC_Dt) { + mandoc_vmsg(MANDOCERR_DT_LATE, + mdoc->parse, line, ppos, + "Dt %s", buf + *pos); + return; + } + } else if ( ! (mdoc_macros[tok].flags & MDOC_PROLOGUE)) { + if (mdoc->meta.title == NULL) { + mandoc_vmsg(MANDOCERR_DT_NOTITLE, + mdoc->parse, line, ppos, "%s %s", + mdoc_macronames[tok], buf + *pos); + mdoc->meta.title = mandoc_strdup("UNTITLED"); + } + if (NULL == mdoc->meta.vol) + mdoc->meta.vol = mandoc_strdup("LOCAL"); + mdoc->flags |= MDOC_PBODY; + } + (*mdoc_macros[tok].fp)(mdoc, tok, line, ppos, pos, buf); } - -int -mdoc_verr(struct mdoc *mdoc, int ln, int pos, - const char *fmt, ...) +void +mdoc_tail_alloc(struct roff_man *mdoc, int line, int pos, int tok) { - char buf[256]; - va_list ap; + struct roff_node *p; - if (NULL == mdoc->cb.mdoc_err) - return(0); - - va_start(ap, fmt); - (void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap); - va_end(ap); - return((*mdoc->cb.mdoc_err)(mdoc->data, ln, pos, buf)); + p = roff_node_alloc(mdoc, line, pos, ROFFT_TAIL, tok); + roff_node_append(mdoc, p); + mdoc->next = ROFF_NEXT_CHILD; } - -int -mdoc_vwarn(struct mdoc *mdoc, int ln, int pos, - enum mdoc_warn type, const char *fmt, ...) +struct roff_node * +mdoc_endbody_alloc(struct roff_man *mdoc, int line, int pos, int tok, + struct roff_node *body, enum mdoc_endbody end) { - char buf[256]; - va_list ap; + struct roff_node *p; - if (NULL == mdoc->cb.mdoc_warn) - return(0); - - va_start(ap, fmt); - (void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap); - va_end(ap); - return((*mdoc->cb.mdoc_warn)(mdoc->data, ln, pos, type, buf)); + body->flags |= MDOC_ENDED; + body->parent->flags |= MDOC_ENDED; + p = roff_node_alloc(mdoc, line, pos, ROFFT_BODY, tok); + p->body = body; + p->norm = body->norm; + p->end = end; + roff_node_append(mdoc, p); + mdoc->next = ROFF_NEXT_SIBLING; + return p; } - -int -mdoc_macro(struct mdoc *mdoc, int tok, - int ln, int ppos, int *pos, char *buf) +struct roff_node * +mdoc_block_alloc(struct roff_man *mdoc, int line, int pos, + int tok, struct mdoc_arg *args) { + struct roff_node *p; - assert(mdoc_macros[tok].fp); + p = roff_node_alloc(mdoc, line, pos, ROFFT_BLOCK, tok); + p->args = args; + if (p->args) + (args->refcnt)++; - if (MDOC_PROLOGUE & mdoc_macros[tok].flags && - SEC_PROLOGUE != mdoc->lastnamed) - return(mdoc_perr(mdoc, ln, ppos, "macro disallowed in document body")); - if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && - SEC_PROLOGUE == mdoc->lastnamed) - return(mdoc_perr(mdoc, ln, ppos, "macro disallowed in document prologue")); - if (1 != ppos && ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) - return(mdoc_perr(mdoc, ln, ppos, "macro not callable")); - return((*mdoc_macros[tok].fp)(mdoc, tok, ln, ppos, pos, buf)); -} - - -static int -mdoc_node_append(struct mdoc *mdoc, struct mdoc_node *p) -{ - - assert(mdoc->last); - assert(mdoc->first); - assert(MDOC_ROOT != p->type); - - /* See if we exceed the suggest line-max. */ - - switch (p->type) { - case (MDOC_TEXT): - /* FALLTHROUGH */ - case (MDOC_ELEM): - /* FALLTHROUGH */ - case (MDOC_BLOCK): - mdoc->linetok++; + switch (tok) { + case MDOC_Bd: + case MDOC_Bf: + case MDOC_Bl: + case MDOC_En: + case MDOC_Rs: + p->norm = mandoc_calloc(1, sizeof(union mdoc_data)); break; default: break; } + roff_node_append(mdoc, p); + mdoc->next = ROFF_NEXT_CHILD; + return p; +} - /* This sort-of works (re-opening of text macros...). */ - if (mdoc->linetok > MDOC_LINEARG_SOFTMAX) - if ( ! mdoc_nwarn(mdoc, p, WARN_COMPAT, - "suggested %d tokens per line exceeded (has %d)", - MDOC_LINEARG_SOFTMAX, mdoc->linetok)) - return(0); +void +mdoc_elem_alloc(struct roff_man *mdoc, int line, int pos, + int tok, struct mdoc_arg *args) +{ + struct roff_node *p; - switch (mdoc->next) { - case (MDOC_NEXT_SIBLING): - mdoc->last->next = p; - p->prev = mdoc->last; - p->parent = mdoc->last->parent; - break; - case (MDOC_NEXT_CHILD): - mdoc->last->child = p; - p->parent = mdoc->last; - break; - default: - abort(); - /* NOTREACHED */ - } + p = roff_node_alloc(mdoc, line, pos, ROFFT_ELEM, tok); + p->args = args; + if (p->args) + (args->refcnt)++; - if ( ! mdoc_valid_pre(mdoc, p)) - return(0); - - switch (p->type) { - case (MDOC_HEAD): - assert(MDOC_BLOCK == p->parent->type); - p->parent->data.block.head = p; + switch (tok) { + case MDOC_An: + p->norm = mandoc_calloc(1, sizeof(union mdoc_data)); break; - case (MDOC_TAIL): - assert(MDOC_BLOCK == p->parent->type); - p->parent->data.block.tail = p; - break; - case (MDOC_BODY): - assert(MDOC_BLOCK == p->parent->type); - p->parent->data.block.body = p; - break; default: break; } - - mdoc->last = p; - return(1); + roff_node_append(mdoc, p); + mdoc->next = ROFF_NEXT_CHILD; } - -static struct mdoc_node * -mdoc_node_alloc(const struct mdoc *mdoc) +void +mdoc_node_relink(struct roff_man *mdoc, struct roff_node *p) { - struct mdoc_node *p; - p = xcalloc(1, sizeof(struct mdoc_node)); - p->sec = mdoc->lastsec; - - return(p); + roff_node_unlink(mdoc, p); + roff_node_append(mdoc, p); } - -int -mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, int tok) +/* + * Parse free-form text, that is, a line that does not begin with the + * control character. + */ +static int +mdoc_ptext(struct roff_man *mdoc, int line, char *buf, int offs) { - struct mdoc_node *p; + struct roff_node *n; + char *c, *ws, *end; - assert(mdoc->first); assert(mdoc->last); + n = mdoc->last; - p = mdoc_node_alloc(mdoc); + /* + * Divert directly to list processing if we're encountering a + * columnar ROFFT_BLOCK with or without a prior ROFFT_BLOCK entry + * (a ROFFT_BODY means it's already open, in which case we should + * process within its context in the normal way). + */ - p->line = line; - p->pos = pos; - p->type = MDOC_TAIL; - p->tok = tok; + if (n->tok == MDOC_Bl && n->type == ROFFT_BODY && + n->end == ENDBODY_NOT && n->norm->Bl.type == LIST_column) { + /* `Bl' is open without any children. */ + mdoc->flags |= MDOC_FREECOL; + mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf); + return 1; + } - return(mdoc_node_append(mdoc, p)); -} + if (n->tok == MDOC_It && n->type == ROFFT_BLOCK && + NULL != n->parent && + MDOC_Bl == n->parent->tok && + LIST_column == n->parent->norm->Bl.type) { + /* `Bl' has block-level `It' children. */ + mdoc->flags |= MDOC_FREECOL; + mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf); + return 1; + } + /* + * Search for the beginning of unescaped trailing whitespace (ws) + * and for the first character not to be output (end). + */ -int -mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, int tok) -{ - struct mdoc_node *p; + /* FIXME: replace with strcspn(). */ + ws = NULL; + for (c = end = buf + offs; *c; c++) { + switch (*c) { + case ' ': + if (NULL == ws) + ws = c; + continue; + case '\t': + /* + * Always warn about trailing tabs, + * even outside literal context, + * where they should be put on the next line. + */ + if (NULL == ws) + ws = c; + /* + * Strip trailing tabs in literal context only; + * outside, they affect the next line. + */ + if (MDOC_LITERAL & mdoc->flags) + continue; + break; + case '\\': + /* Skip the escaped character, too, if any. */ + if (c[1]) + c++; + /* FALLTHROUGH */ + default: + ws = NULL; + break; + } + end = c + 1; + } + *end = '\0'; - assert(mdoc->first); - assert(mdoc->last); + if (ws) + mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse, + line, (int)(ws-buf), NULL); - p = mdoc_node_alloc(mdoc); + if (buf[offs] == '\0' && ! (mdoc->flags & MDOC_LITERAL)) { + mandoc_msg(MANDOCERR_FI_BLANK, mdoc->parse, + line, (int)(c - buf), NULL); - p->line = line; - p->pos = pos; - p->type = MDOC_HEAD; - p->tok = tok; + /* + * Insert a `sp' in the case of a blank line. Technically, + * blank lines aren't allowed, but enough manuals assume this + * behaviour that we want to work around it. + */ + roff_elem_alloc(mdoc, line, offs, MDOC_sp); + mdoc->next = ROFF_NEXT_SIBLING; + mdoc_valid_post(mdoc); + return 1; + } - return(mdoc_node_append(mdoc, p)); -} + roff_word_alloc(mdoc, line, offs, buf+offs); + if (mdoc->flags & MDOC_LITERAL) + return 1; -int -mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, int tok) -{ - struct mdoc_node *p; + /* + * End-of-sentence check. If the last character is an unescaped + * EOS character, then flag the node as being the end of a + * sentence. The front-end will know how to interpret this. + */ - assert(mdoc->first); - assert(mdoc->last); + assert(buf < end); - p = mdoc_node_alloc(mdoc); - - p->line = line; - p->pos = pos; - p->type = MDOC_BODY; - p->tok = tok; - - return(mdoc_node_append(mdoc, p)); + if (mandoc_eos(buf+offs, (size_t)(end-buf-offs))) + mdoc->last->flags |= MDOC_EOS; + return 1; } - -int -mdoc_root_alloc(struct mdoc *mdoc) +/* + * Parse a macro line, that is, a line beginning with the control + * character. + */ +static int +mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, int offs) { - struct mdoc_node *p; + struct roff_node *n; + const char *cp; + int tok; + int i, sv; + char mac[5]; - p = mdoc_node_alloc(mdoc); + sv = offs; - p->type = MDOC_ROOT; + /* + * Copy the first word into a nil-terminated buffer. + * Stop when a space, tab, escape, or eoln is encountered. + */ - return(mdoc_node_append(mdoc, p)); -} + i = 0; + while (i < 4 && strchr(" \t\\", buf[offs]) == NULL) + mac[i++] = buf[offs++]; + mac[i] = '\0'; -int -mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, - int tok, size_t argsz, const struct mdoc_arg *args) -{ - struct mdoc_node *p; + tok = (i > 1 && i < 4) ? mdoc_hash_find(mac) : TOKEN_NONE; - p = mdoc_node_alloc(mdoc); + if (tok == TOKEN_NONE) { + mandoc_msg(MANDOCERR_MACRO, mdoc->parse, + ln, sv, buf + sv - 1); + return 1; + } - p->pos = pos; - p->line = line; - p->type = MDOC_BLOCK; - p->tok = tok; - p->data.block.argc = argsz; - p->data.block.argv = argdup(argsz, args); + /* Skip a leading escape sequence or tab. */ - return(mdoc_node_append(mdoc, p)); -} + switch (buf[offs]) { + case '\\': + cp = buf + offs + 1; + mandoc_escape(&cp, NULL, NULL); + offs = cp - buf; + break; + case '\t': + offs++; + break; + default: + break; + } + /* Jump to the next non-whitespace word. */ -int -mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, - int tok, size_t argsz, const struct mdoc_arg *args) -{ - struct mdoc_node *p; + while (buf[offs] && ' ' == buf[offs]) + offs++; - p = mdoc_node_alloc(mdoc); + /* + * Trailing whitespace. Note that tabs are allowed to be passed + * into the parser as "text", so we only warn about spaces here. + */ - p->line = line; - p->pos = pos; - p->type = MDOC_ELEM; - p->tok = tok; - p->data.elem.argc = argsz; - p->data.elem.argv = argdup(argsz, args); + if ('\0' == buf[offs] && ' ' == buf[offs - 1]) + mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse, + ln, offs - 1, NULL); - return(mdoc_node_append(mdoc, p)); -} + /* + * If an initial macro or a list invocation, divert directly + * into macro processing. + */ + if (NULL == mdoc->last || MDOC_It == tok || MDOC_El == tok) { + mdoc_macro(mdoc, tok, ln, sv, &offs, buf); + return 1; + } -int -mdoc_word_alloc(struct mdoc *mdoc, - int line, int pos, const char *word) -{ - struct mdoc_node *p; + n = mdoc->last; + assert(mdoc->last); - p = mdoc_node_alloc(mdoc); + /* + * If the first macro of a `Bl -column', open an `It' block + * context around the parsed macro. + */ - p->line = line; - p->pos = pos; - p->type = MDOC_TEXT; - p->data.text.string = xstrdup(word); + if (n->tok == MDOC_Bl && n->type == ROFFT_BODY && + n->end == ENDBODY_NOT && n->norm->Bl.type == LIST_column) { + mdoc->flags |= MDOC_FREECOL; + mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf); + return 1; + } - return(mdoc_node_append(mdoc, p)); -} + /* + * 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. + */ - -static void -argfree(size_t sz, struct mdoc_arg *p) -{ - int i, j; - - if (0 == sz) - return; - - assert(p); - /* LINTED */ - for (i = 0; i < (int)sz; i++) - if (p[i].sz > 0) { - assert(p[i].value); - /* LINTED */ - for (j = 0; j < (int)p[i].sz; j++) - free(p[i].value[j]); - free(p[i].value); - } - free(p); -} - - -static void -mdoc_elem_free(struct mdoc_elem *p) -{ - - argfree(p->argc, p->argv); -} - - -static void -mdoc_block_free(struct mdoc_block *p) -{ - - argfree(p->argc, p->argv); -} - - -static void -mdoc_text_free(struct mdoc_text *p) -{ - - if (p->string) - free(p->string); -} - - -void -mdoc_node_free(struct mdoc_node *p) -{ - - switch (p->type) { - case (MDOC_TEXT): - mdoc_text_free(&p->data.text); - break; - case (MDOC_ELEM): - mdoc_elem_free(&p->data.elem); - break; - case (MDOC_BLOCK): - mdoc_block_free(&p->data.block); - break; - default: - break; + if (n->tok == MDOC_It && n->type == ROFFT_BLOCK && + NULL != n->parent && + MDOC_Bl == n->parent->tok && + LIST_column == n->parent->norm->Bl.type) { + mdoc->flags |= MDOC_FREECOL; + mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf); + return 1; } - free(p); -} + /* Normal processing of a macro. */ + mdoc_macro(mdoc, tok, ln, sv, &offs, buf); -void -mdoc_node_freelist(struct mdoc_node *p) -{ + /* In quick mode (for mandocdb), abort after the NAME section. */ - if (p->child) - mdoc_node_freelist(p->child); - if (p->next) - mdoc_node_freelist(p->next); + if (mdoc->quick && MDOC_Sh == tok && + SEC_NAME != mdoc->last->sec) + return 2; - mdoc_node_free(p); + return 1; } - -int -mdoc_find(const struct mdoc *mdoc, const char *key) +enum mdelim +mdoc_isdelim(const char *p) { - return(mdoc_tokhash_find(mdoc->htab, key)); -} + if ('\0' == p[0]) + return DELIM_NONE; + if ('\0' == p[1]) + switch (p[0]) { + case '(': + case '[': + return DELIM_OPEN; + case '|': + return DELIM_MIDDLE; + case '.': + case ',': + case ';': + case ':': + case '?': + case '!': + case ')': + case ']': + return DELIM_CLOSE; + default: + return DELIM_NONE; + } -static void -argcpy(struct mdoc_arg *dst, const struct mdoc_arg *src) -{ - int i; + if ('\\' != p[0]) + return DELIM_NONE; - dst->line = src->line; - dst->pos = src->pos; - dst->arg = src->arg; - if (0 == (dst->sz = src->sz)) - return; - dst->value = xcalloc(dst->sz, sizeof(char *)); - for (i = 0; i < (int)dst->sz; i++) - dst->value[i] = xstrdup(src->value[i]); -} + if (0 == strcmp(p + 1, ".")) + return DELIM_CLOSE; + if (0 == strcmp(p + 1, "fR|\\fP")) + return DELIM_MIDDLE; - -static struct mdoc_arg * -argdup(size_t argsz, const struct mdoc_arg *args) -{ - struct mdoc_arg *pp; - int i; - - if (0 == argsz) - return(NULL); - - pp = xcalloc((size_t)argsz, sizeof(struct mdoc_arg)); - for (i = 0; i < (int)argsz; i++) - argcpy(&pp[i], &args[i]); - - return(pp); + return DELIM_NONE; } -