=================================================================== RCS file: /cvs/mandoc/mdoc.c,v retrieving revision 1.220 retrieving revision 1.244 diff -u -p -r1.220 -r1.244 --- mandoc/mdoc.c 2014/07/09 11:31:43 1.220 +++ mandoc/mdoc.c 2015/04/18 17:01:58 1.244 @@ -1,23 +1,21 @@ -/* $Id: mdoc.c,v 1.220 2014/07/09 11:31:43 schwarze Exp $ */ +/* $Id: mdoc.c,v 1.244 2015/04/18 17:01:58 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons - * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze + * 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. * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * 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 AUTHOR BE LIABLE FOR + * 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. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include @@ -29,11 +27,12 @@ #include #include -#include "mdoc.h" -#include "mandoc.h" #include "mandoc_aux.h" -#include "libmdoc.h" +#include "mandoc.h" +#include "roff.h" +#include "mdoc.h" #include "libmandoc.h" +#include "libmdoc.h" const char *const __mdoc_macronames[MDOC_MAX + 1] = { "Ap", "Dd", "Dt", "Os", @@ -84,35 +83,29 @@ const char *const __mdoc_argnames[MDOC_ARG_MAX] = { const char * const *mdoc_macronames = __mdoc_macronames; const char * const *mdoc_argnames = __mdoc_argnames; -static void mdoc_node_free(struct mdoc_node *); -static void mdoc_node_unlink(struct mdoc *, - struct mdoc_node *); -static void mdoc_free1(struct mdoc *); -static void mdoc_alloc1(struct mdoc *); -static struct mdoc_node *node_alloc(struct mdoc *, int, int, - enum mdoct, enum mdoc_type); -static int node_append(struct mdoc *, - struct mdoc_node *); -#if 0 -static int mdoc_preptext(struct mdoc *, int, char *, int); -#endif -static int mdoc_ptext(struct mdoc *, int, char *, int); -static int mdoc_pmacro(struct mdoc *, int, char *, int); +static void mdoc_node_free(struct roff_node *); +static void mdoc_node_unlink(struct roff_man *, + struct roff_node *); +static void mdoc_free1(struct roff_man *); +static void mdoc_alloc1(struct roff_man *); +static struct roff_node *node_alloc(struct roff_man *, int, int, + int, enum roff_type); +static void node_append(struct roff_man *, struct roff_node *); +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) +const struct roff_node * +mdoc_node(const struct roff_man *mdoc) { - assert( ! (MDOC_HALT & mdoc->flags)); return(mdoc->first); } -const struct mdoc_meta * -mdoc_meta(const struct mdoc *mdoc) +const struct roff_meta * +mdoc_meta(const struct roff_man *mdoc) { - assert( ! (MDOC_HALT & mdoc->flags)); return(&mdoc->meta); } @@ -120,42 +113,36 @@ mdoc_meta(const struct mdoc *mdoc) * Frees volatile resources (parse tree, meta-data, fields). */ static void -mdoc_free1(struct mdoc *mdoc) +mdoc_free1(struct roff_man *mdoc) { if (mdoc->first) mdoc_node_delete(mdoc, mdoc->first); - 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); - if (mdoc->meta.msec) - free(mdoc->meta.msec); - if (mdoc->meta.date) - free(mdoc->meta.date); + free(mdoc->meta.msec); + free(mdoc->meta.vol); + free(mdoc->meta.arch); + free(mdoc->meta.date); + free(mdoc->meta.title); + free(mdoc->meta.os); + free(mdoc->meta.name); } /* * Allocate all volatile resources (parse tree, meta-data, fields). */ static void -mdoc_alloc1(struct mdoc *mdoc) +mdoc_alloc1(struct roff_man *mdoc) { - memset(&mdoc->meta, 0, sizeof(struct mdoc_meta)); + memset(&mdoc->meta, 0, sizeof(mdoc->meta)); + mdoc->macroset = MACROSET_MDOC; mdoc->flags = 0; mdoc->lastnamed = mdoc->lastsec = SEC_NONE; - mdoc->last = mandoc_calloc(1, sizeof(struct mdoc_node)); + mdoc->last = mandoc_calloc(1, sizeof(*mdoc->last)); mdoc->first = mdoc->last; - mdoc->last->type = MDOC_ROOT; + mdoc->last->type = ROFFT_ROOT; mdoc->last->tok = MDOC_MAX; - mdoc->next = MDOC_NEXT_CHILD; + mdoc->next = ROFF_NEXT_CHILD; } /* @@ -165,7 +152,7 @@ mdoc_alloc1(struct mdoc *mdoc) * cross-parse non-volatile data is kept intact. */ void -mdoc_reset(struct mdoc *mdoc) +mdoc_reset(struct roff_man *mdoc) { mdoc_free1(mdoc); @@ -177,7 +164,7 @@ mdoc_reset(struct mdoc *mdoc) * After invocation, the pointer is no longer usable. */ void -mdoc_free(struct mdoc *mdoc) +mdoc_free(struct roff_man *mdoc) { mdoc_free1(mdoc); @@ -187,71 +174,52 @@ mdoc_free(struct mdoc *mdoc) /* * Allocate volatile and non-volatile parse resources. */ -struct mdoc * +struct roff_man * mdoc_alloc(struct roff *roff, struct mparse *parse, const char *defos, int quick) { - struct mdoc *p; + struct roff_man *p; - p = mandoc_calloc(1, sizeof(struct mdoc)); + p = mandoc_calloc(1, sizeof(*p)); p->parse = parse; p->defos = defos; p->quick = quick; p->roff = roff; - mdoc_hash_init(); mdoc_alloc1(p); return(p); } -/* - * Climb back up the parse tree, validating open scopes. Mostly calls - * through to macro_end() in macro.c. - */ -int -mdoc_endparse(struct mdoc *mdoc) +void +mdoc_endparse(struct roff_man *mdoc) { - assert( ! (MDOC_HALT & mdoc->flags)); - if (mdoc_macroend(mdoc)) - return(1); - mdoc->flags |= MDOC_HALT; - return(0); + mdoc_macroend(mdoc); } -int -mdoc_addeqn(struct mdoc *mdoc, const struct eqn *ep) +void +mdoc_addeqn(struct roff_man *mdoc, const struct eqn *ep) { - struct mdoc_node *n; + struct roff_node *n; - assert( ! (MDOC_HALT & mdoc->flags)); - - n = node_alloc(mdoc, ep->ln, ep->pos, MDOC_MAX, MDOC_EQN); + n = node_alloc(mdoc, ep->ln, ep->pos, MDOC_MAX, ROFFT_EQN); n->eqn = ep; - - if ( ! node_append(mdoc, n)) - return(0); - - mdoc->next = MDOC_NEXT_SIBLING; - return(1); + if (ep->ln > mdoc->last->line) + n->flags |= MDOC_LINE; + node_append(mdoc, n); + mdoc->next = ROFF_NEXT_SIBLING; } -int -mdoc_addspan(struct mdoc *mdoc, const struct tbl_span *sp) +void +mdoc_addspan(struct roff_man *mdoc, const struct tbl_span *sp) { - struct mdoc_node *n; + struct roff_node *n; - assert( ! (MDOC_HALT & mdoc->flags)); - - n = node_alloc(mdoc, sp->line, 0, MDOC_MAX, MDOC_TBL); + n = node_alloc(mdoc, sp->line, 0, MDOC_MAX, ROFFT_TBL); n->span = sp; - - if ( ! node_append(mdoc, n)) - return(0); - - mdoc->next = MDOC_NEXT_SIBLING; - return(1); + node_append(mdoc, n); + mdoc->next = ROFF_NEXT_SIBLING; } /* @@ -259,13 +227,12 @@ mdoc_addspan(struct mdoc *mdoc, const struct tbl_span * the macro (mdoc_pmacro()) or text parser (mdoc_ptext()). */ int -mdoc_parseln(struct mdoc *mdoc, int ln, char *buf, int offs) +mdoc_parseln(struct roff_man *mdoc, int ln, char *buf, int offs) { - assert( ! (MDOC_HALT & mdoc->flags)); + if (mdoc->last->type != ROFFT_EQN || ln > mdoc->last->line) + mdoc->flags |= MDOC_NEWLINE; - mdoc->flags |= MDOC_NEWLINE; - /* * Let the roff nS register switch SYNOPSIS mode early, * such that the parser knows at all times @@ -282,59 +249,48 @@ mdoc_parseln(struct mdoc *mdoc, int ln, char *buf, int mdoc_ptext(mdoc, ln, buf, offs)); } -int +void mdoc_macro(MACRO_PROT_ARGS) { assert(tok < MDOC_MAX); - /* If we're in the body, deny prologue calls. */ - - if (MDOC_PROLOGUE & mdoc_macros[tok].flags && - MDOC_PBODY & mdoc->flags) { - mandoc_vmsg(MANDOCERR_PROLOG_ONLY, mdoc->parse, - line, ppos, "%s", mdoc_macronames[tok]); - return(1); - } - - /* If we're in the prologue, deny "body" macros. */ - - if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && - ! (MDOC_PBODY & mdoc->flags)) { - mandoc_vmsg(MANDOCERR_PROLOG_BAD, mdoc->parse, - line, ppos, "%s", mdoc_macronames[tok]); - if (NULL == mdoc->meta.msec) - mdoc->meta.msec = mandoc_strdup("1"); - if (NULL == mdoc->meta.title) - mdoc->meta.title = mandoc_strdup("UNKNOWN"); + 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"); - if (NULL == mdoc->meta.os) - mdoc->meta.os = mandoc_strdup("LOCAL"); - if (NULL == mdoc->meta.date) - mdoc->meta.date = mandoc_normdate - (mdoc->parse, NULL, line, ppos); mdoc->flags |= MDOC_PBODY; } - - return((*mdoc_macros[tok].fp)(mdoc, tok, line, ppos, pos, buf)); + (*mdoc_macros[tok].fp)(mdoc, tok, line, ppos, pos, buf); } -static int -node_append(struct mdoc *mdoc, struct mdoc_node *p) +static void +node_append(struct roff_man *mdoc, struct roff_node *p) { assert(mdoc->last); assert(mdoc->first); - assert(MDOC_ROOT != p->type); + assert(p->type != ROFFT_ROOT); switch (mdoc->next) { - case MDOC_NEXT_SIBLING: + case ROFF_NEXT_SIBLING: mdoc->last->next = p; p->prev = mdoc->last; p->parent = mdoc->last->parent; break; - case MDOC_NEXT_CHILD: + case ROFF_NEXT_CHILD: mdoc->last->child = p; p->parent = mdoc->last; break; @@ -351,35 +307,34 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p) */ switch (p->type) { - case MDOC_BODY: + case ROFFT_BODY: if (ENDBODY_NOT != p->end) break; /* FALLTHROUGH */ - case MDOC_TAIL: + case ROFFT_TAIL: /* FALLTHROUGH */ - case MDOC_HEAD: + case ROFFT_HEAD: p->norm = p->parent->norm; break; default: break; } - if ( ! mdoc_valid_pre(mdoc, p)) - return(0); + mdoc_valid_pre(mdoc, p); switch (p->type) { - case MDOC_HEAD: - assert(MDOC_BLOCK == p->parent->type); + case ROFFT_HEAD: + assert(p->parent->type == ROFFT_BLOCK); p->parent->head = p; break; - case MDOC_TAIL: - assert(MDOC_BLOCK == p->parent->type); + case ROFFT_TAIL: + assert(p->parent->type == ROFFT_BLOCK); p->parent->tail = p; break; - case MDOC_BODY: + case ROFFT_BODY: if (p->end) break; - assert(MDOC_BLOCK == p->parent->type); + assert(p->parent->type == ROFFT_BLOCK); p->parent->body = p; break; default: @@ -389,30 +344,26 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p) mdoc->last = p; switch (p->type) { - case MDOC_TBL: + case ROFFT_TBL: /* FALLTHROUGH */ - case MDOC_TEXT: - if ( ! mdoc_valid_post(mdoc)) - return(0); + case ROFFT_TEXT: + mdoc_valid_post(mdoc); break; default: break; } - - return(1); } -static struct mdoc_node * -node_alloc(struct mdoc *mdoc, int line, int pos, - enum mdoct tok, enum mdoc_type type) +static struct roff_node * +node_alloc(struct roff_man *mdoc, int line, int pos, + int tok, enum roff_type type) { - struct mdoc_node *p; + struct roff_node *p; - p = mandoc_calloc(1, sizeof(struct mdoc_node)); + p = mandoc_calloc(1, sizeof(*p)); p->sec = mdoc->lastsec; p->line = line; p->pos = pos; - p->lastline = line; p->tok = tok; p->type = type; @@ -429,68 +380,64 @@ node_alloc(struct mdoc *mdoc, int line, int pos, return(p); } -int -mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok) +void +mdoc_tail_alloc(struct roff_man *mdoc, int line, int pos, int tok) { - struct mdoc_node *p; + struct roff_node *p; - p = node_alloc(mdoc, line, pos, tok, MDOC_TAIL); - if ( ! node_append(mdoc, p)) - return(0); - mdoc->next = MDOC_NEXT_CHILD; - return(1); + p = node_alloc(mdoc, line, pos, tok, ROFFT_TAIL); + node_append(mdoc, p); + mdoc->next = ROFF_NEXT_CHILD; } -int -mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok) +struct roff_node * +mdoc_head_alloc(struct roff_man *mdoc, int line, int pos, int tok) { - struct mdoc_node *p; + struct roff_node *p; assert(mdoc->first); assert(mdoc->last); - - p = node_alloc(mdoc, line, pos, tok, MDOC_HEAD); - if ( ! node_append(mdoc, p)) - return(0); - mdoc->next = MDOC_NEXT_CHILD; - return(1); + p = node_alloc(mdoc, line, pos, tok, ROFFT_HEAD); + node_append(mdoc, p); + mdoc->next = ROFF_NEXT_CHILD; + return(p); } -int -mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok) +struct roff_node * +mdoc_body_alloc(struct roff_man *mdoc, int line, int pos, int tok) { - struct mdoc_node *p; + struct roff_node *p; - p = node_alloc(mdoc, line, pos, tok, MDOC_BODY); - if ( ! node_append(mdoc, p)) - return(0); - mdoc->next = MDOC_NEXT_CHILD; - return(1); + p = node_alloc(mdoc, line, pos, tok, ROFFT_BODY); + node_append(mdoc, p); + mdoc->next = ROFF_NEXT_CHILD; + return(p); } -int -mdoc_endbody_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok, - struct mdoc_node *body, enum mdoc_endbody end) +struct roff_node * +mdoc_endbody_alloc(struct roff_man *mdoc, int line, int pos, int tok, + struct roff_node *body, enum mdoc_endbody end) { - struct mdoc_node *p; + struct roff_node *p; - p = node_alloc(mdoc, line, pos, tok, MDOC_BODY); - p->pending = body; + body->flags |= MDOC_ENDED; + body->parent->flags |= MDOC_ENDED; + p = node_alloc(mdoc, line, pos, tok, ROFFT_BODY); + p->body = body; p->norm = body->norm; p->end = end; - if ( ! node_append(mdoc, p)) - return(0); - mdoc->next = MDOC_NEXT_SIBLING; - return(1); + node_append(mdoc, p); + mdoc->next = ROFF_NEXT_SIBLING; + return(p); } -int -mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, - enum mdoct tok, struct mdoc_arg *args) +struct roff_node * +mdoc_block_alloc(struct roff_man *mdoc, int line, int pos, + int tok, struct mdoc_arg *args) { - struct mdoc_node *p; + struct roff_node *p; - p = node_alloc(mdoc, line, pos, tok, MDOC_BLOCK); + p = node_alloc(mdoc, line, pos, tok, ROFFT_BLOCK); p->args = args; if (p->args) (args->refcnt)++; @@ -510,20 +457,18 @@ mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, default: break; } - - if ( ! node_append(mdoc, p)) - return(0); - mdoc->next = MDOC_NEXT_CHILD; - return(1); + node_append(mdoc, p); + mdoc->next = ROFF_NEXT_CHILD; + return(p); } -int -mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, - enum mdoct tok, struct mdoc_arg *args) +void +mdoc_elem_alloc(struct roff_man *mdoc, int line, int pos, + int tok, struct mdoc_arg *args) { - struct mdoc_node *p; + struct roff_node *p; - p = node_alloc(mdoc, line, pos, tok, MDOC_ELEM); + p = node_alloc(mdoc, line, pos, tok, ROFFT_ELEM); p->args = args; if (p->args) (args->refcnt)++; @@ -535,32 +480,25 @@ mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, default: break; } - - if ( ! node_append(mdoc, p)) - return(0); - mdoc->next = MDOC_NEXT_CHILD; - return(1); + node_append(mdoc, p); + mdoc->next = ROFF_NEXT_CHILD; } -int -mdoc_word_alloc(struct mdoc *mdoc, int line, int pos, const char *p) +void +mdoc_word_alloc(struct roff_man *mdoc, int line, int pos, const char *p) { - struct mdoc_node *n; + struct roff_node *n; - n = node_alloc(mdoc, line, pos, MDOC_MAX, MDOC_TEXT); + n = node_alloc(mdoc, line, pos, MDOC_MAX, ROFFT_TEXT); n->string = roff_strdup(mdoc->roff, p); - - if ( ! node_append(mdoc, n)) - return(0); - - mdoc->next = MDOC_NEXT_SIBLING; - return(1); + node_append(mdoc, n); + mdoc->next = ROFF_NEXT_SIBLING; } void -mdoc_word_append(struct mdoc *mdoc, const char *p) +mdoc_word_append(struct roff_man *mdoc, const char *p) { - struct mdoc_node *n; + struct roff_node *n; char *addstr, *newstr; n = mdoc->last; @@ -569,14 +507,14 @@ mdoc_word_append(struct mdoc *mdoc, const char *p) free(addstr); free(n->string); n->string = newstr; - mdoc->next = MDOC_NEXT_SIBLING; + mdoc->next = ROFF_NEXT_SIBLING; } static void -mdoc_node_free(struct mdoc_node *p) +mdoc_node_free(struct roff_node *p) { - if (MDOC_BLOCK == p->type || MDOC_ELEM == p->type) + if (p->type == ROFFT_BLOCK || p->type == ROFFT_ELEM) free(p->norm); if (p->string) free(p->string); @@ -586,7 +524,7 @@ mdoc_node_free(struct mdoc_node *p) } static void -mdoc_node_unlink(struct mdoc *mdoc, struct mdoc_node *n) +mdoc_node_unlink(struct roff_man *mdoc, struct roff_node *n) { /* Adjust siblings. */ @@ -611,10 +549,10 @@ mdoc_node_unlink(struct mdoc *mdoc, struct mdoc_node * if (mdoc && mdoc->last == n) { if (n->prev) { mdoc->last = n->prev; - mdoc->next = MDOC_NEXT_SIBLING; + mdoc->next = ROFF_NEXT_SIBLING; } else { mdoc->last = n->parent; - mdoc->next = MDOC_NEXT_CHILD; + mdoc->next = ROFF_NEXT_CHILD; } } @@ -623,7 +561,7 @@ mdoc_node_unlink(struct mdoc *mdoc, struct mdoc_node * } void -mdoc_node_delete(struct mdoc *mdoc, struct mdoc_node *p) +mdoc_node_delete(struct roff_man *mdoc, struct roff_node *p) { while (p->child) { @@ -636,102 +574,50 @@ mdoc_node_delete(struct mdoc *mdoc, struct mdoc_node * mdoc_node_free(p); } -int -mdoc_node_relink(struct mdoc *mdoc, struct mdoc_node *p) +void +mdoc_node_relink(struct roff_man *mdoc, struct roff_node *p) { mdoc_node_unlink(mdoc, p); - return(node_append(mdoc, p)); + node_append(mdoc, p); } -#if 0 /* - * Pre-treat a text line. - * Text lines can consist of equations, which must be handled apart from - * the regular text. - * Thus, use this function to step through a line checking if it has any - * equations embedded in it. - * This must handle multiple equations AND equations that do not end at - * the end-of-line, i.e., will re-enter in the next roff parse. - */ -static int -mdoc_preptext(struct mdoc *mdoc, int line, char *buf, int offs) -{ - char *start, *end; - char delim; - - while ('\0' != buf[offs]) { - /* Mark starting position if eqn is set. */ - start = NULL; - if ('\0' != (delim = roff_eqndelim(mdoc->roff))) - if (NULL != (start = strchr(buf + offs, delim))) - *start++ = '\0'; - - /* Parse text as normal. */ - if ( ! mdoc_ptext(mdoc, line, buf, offs)) - return(0); - - /* Continue only if an equation exists. */ - if (NULL == start) - break; - - /* Read past the end of the equation. */ - offs += start - (buf + offs); - assert(start == &buf[offs]); - if (NULL != (end = strchr(buf + offs, delim))) { - *end++ = '\0'; - while (' ' == *end) - end++; - } - - /* Parse the equation itself. */ - roff_openeqn(mdoc->roff, NULL, line, offs, buf); - - /* Process a finished equation? */ - if (roff_closeeqn(mdoc->roff)) - if ( ! mdoc_addeqn(mdoc, roff_eqn(mdoc->roff))) - return(0); - offs += (end - (buf + offs)); - } - - return(1); -} -#endif - -/* * Parse free-form text, that is, a line that does not begin with the * control character. */ static int -mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int offs) +mdoc_ptext(struct roff_man *mdoc, int line, char *buf, int offs) { + struct roff_node *n; char *c, *ws, *end; - struct mdoc_node *n; assert(mdoc->last); n = mdoc->last; /* * Divert directly to list processing if we're encountering a - * columnar MDOC_BLOCK with or without a prior MDOC_BLOCK entry - * (a MDOC_BODY means it's already open, in which case we should + * 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). */ - if (MDOC_Bl == n->tok && MDOC_BODY == n->type && - LIST_column == n->norm->Bl.type) { + 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; - return(mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf)); + mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf); + return(1); } - if (MDOC_It == n->tok && MDOC_BLOCK == n->type && + 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; - return(mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf)); + mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf); + return(1); } /* @@ -779,7 +665,7 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse, line, (int)(ws-buf), NULL); - if ('\0' == buf[offs] && ! (MDOC_LITERAL & mdoc->flags)) { + if (buf[offs] == '\0' && ! (mdoc->flags & MDOC_LITERAL)) { mandoc_msg(MANDOCERR_FI_BLANK, mdoc->parse, line, (int)(c - buf), NULL); @@ -788,18 +674,15 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int * blank lines aren't allowed, but enough manuals assume this * behaviour that we want to work around it. */ - if ( ! mdoc_elem_alloc(mdoc, line, offs, MDOC_sp, NULL)) - return(0); - - mdoc->next = MDOC_NEXT_SIBLING; - - return(mdoc_valid_post(mdoc)); + mdoc_elem_alloc(mdoc, line, offs, MDOC_sp, NULL); + mdoc->next = ROFF_NEXT_SIBLING; + mdoc_valid_post(mdoc); + return(1); } - if ( ! mdoc_word_alloc(mdoc, line, offs, buf+offs)) - return(0); + mdoc_word_alloc(mdoc, line, offs, buf+offs); - if (MDOC_LITERAL & mdoc->flags) + if (mdoc->flags & MDOC_LITERAL) return(1); /* @@ -812,7 +695,6 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int if (mandoc_eos(buf+offs, (size_t)(end-buf-offs))) mdoc->last->flags |= MDOC_EOS; - return(1); } @@ -821,48 +703,49 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int * character. */ static int -mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs) +mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, int offs) { - enum mdoct tok; + struct roff_node *n; + const char *cp; + int tok; int i, sv; char mac[5]; - struct mdoc_node *n; - /* Empty post-control lines are ignored. */ - - if ('"' == buf[offs]) { - mandoc_msg(MANDOCERR_COMMENT_BAD, mdoc->parse, - ln, offs, NULL); - return(1); - } else if ('\0' == buf[offs]) - return(1); - sv = offs; /* * Copy the first word into a nil-terminated buffer. - * Stop copying when a tab, space, or eoln is encountered. + * Stop when a space, tab, escape, or eoln is encountered. */ i = 0; - while (i < 4 && '\0' != buf[offs] && ' ' != buf[offs] && - '\t' != buf[offs]) + while (i < 4 && strchr(" \t\\", buf[offs]) == NULL) mac[i++] = buf[offs++]; mac[i] = '\0'; tok = (i > 1 && i < 4) ? mdoc_hash_find(mac) : MDOC_MAX; - if (MDOC_MAX == tok) { - mandoc_vmsg(MANDOCERR_MACRO, mdoc->parse, - ln, sv, "%s", buf + sv - 1); + if (tok == MDOC_MAX) { + mandoc_msg(MANDOCERR_MACRO, mdoc->parse, + ln, sv, buf + sv - 1); return(1); } - /* Disregard the first trailing tab, if applicable. */ + /* Skip a leading escape sequence or tab. */ - if ('\t' == buf[offs]) + 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. */ @@ -884,8 +767,7 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int */ if (NULL == mdoc->last || MDOC_It == tok || MDOC_El == tok) { - if ( ! mdoc_macro(mdoc, tok, ln, sv, &offs, buf)) - goto err; + mdoc_macro(mdoc, tok, ln, sv, &offs, buf); return(1); } @@ -897,11 +779,10 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int * context around the parsed macro. */ - if (MDOC_Bl == n->tok && MDOC_BODY == n->type && - LIST_column == n->norm->Bl.type) { + if (n->tok == MDOC_Bl && n->type == ROFFT_BODY && + n->end == ENDBODY_NOT && n->norm->Bl.type == LIST_column) { mdoc->flags |= MDOC_FREECOL; - if ( ! mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf)) - goto err; + mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf); return(1); } @@ -911,20 +792,18 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int * then open an `It' block context around the parsed macro. */ - if (MDOC_It == n->tok && MDOC_BLOCK == n->type && + 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; - if ( ! mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf)) - goto err; + mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf); return(1); } /* Normal processing of a macro. */ - if ( ! mdoc_macro(mdoc, tok, ln, sv, &offs, buf)) - goto err; + mdoc_macro(mdoc, tok, ln, sv, &offs, buf); /* In quick mode (for mandocdb), abort after the NAME section. */ @@ -933,11 +812,6 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int return(2); return(1); - -err: /* Error out. */ - - mdoc->flags |= MDOC_HALT; - return(0); } enum mdelim @@ -987,12 +861,12 @@ mdoc_isdelim(const char *p) } void -mdoc_deroff(char **dest, const struct mdoc_node *n) +mdoc_deroff(char **dest, const struct roff_node *n) { char *cp; size_t sz; - if (MDOC_TEXT != n->type) { + if (n->type != ROFFT_TEXT) { for (n = n->child; n; n = n->next) mdoc_deroff(dest, n); return;