=================================================================== RCS file: /cvs/mandoc/man.c,v retrieving revision 1.102 retrieving revision 1.157 diff -u -p -r1.102 -r1.157 --- mandoc/man.c 2011/03/07 01:35:51 1.102 +++ mandoc/man.c 2015/04/18 17:53:21 1.157 @@ -1,189 +1,101 @@ -/* $Id: man.c,v 1.102 2011/03/07 01:35:51 schwarze Exp $ */ +/* $Id: man.c,v 1.157 2015/04/18 17:53:21 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons + * Copyright (c) 2013, 2014, 2015 Ingo Schwarze + * Copyright (c) 2011 Joerg Sonnenberger * * 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 #include +#include #include #include #include #include +#include "mandoc_aux.h" #include "mandoc.h" -#include "libman.h" +#include "roff.h" +#include "man.h" #include "libmandoc.h" +#include "libman.h" -const char *const __man_macronames[MAN_MAX] = { +const char *const __man_macronames[MAN_MAX] = { "br", "TH", "SH", "SS", - "TP", "LP", "PP", "P", + "TP", "LP", "PP", "P", "IP", "HP", "SM", "SB", "BI", "IB", "BR", "RB", "R", "B", "I", "IR", - "RI", "na", "sp", "nf", + "RI", "sp", "nf", "fi", "RE", "RS", "DT", "UC", "PD", "AT", "in", - "ft" + "ft", "OP", "EX", "EE", + "UR", "UE", "ll" }; const char * const *man_macronames = __man_macronames; -static struct man_node *man_node_alloc(struct man *, int, int, - enum man_type, enum mant); -static int man_node_append(struct man *, - struct man_node *); -static void man_node_free(struct man_node *); -static void man_node_unlink(struct man *, - struct man_node *); -static int man_ptext(struct man *, int, char *, int); -static int man_pmacro(struct man *, int, char *, int); -static void man_free1(struct man *); -static void man_alloc1(struct man *); -static int man_descope(struct man *, int, int); +static void man_breakscope(struct roff_man *, int); +static void man_descope(struct roff_man *, int, int); +static struct roff_node *man_node_alloc(struct roff_man *, int, int, + enum roff_type, int); +static void man_node_append(struct roff_man *, + struct roff_node *); +static void man_node_free(struct roff_node *); +static void man_node_unlink(struct roff_man *, + struct roff_node *); +static int man_ptext(struct roff_man *, int, char *, int); +static int man_pmacro(struct roff_man *, int, char *, int); -const struct man_node * -man_node(const struct man *m) -{ - - assert( ! (MAN_HALT & m->flags)); - return(m->first); -} - - -const struct man_meta * -man_meta(const struct man *m) -{ - - assert( ! (MAN_HALT & m->flags)); - return(&m->meta); -} - - void -man_reset(struct man *man) +man_endparse(struct roff_man *man) { - man_free1(man); - man_alloc1(man); + man_macroend(man); } - -void -man_free(struct man *man) -{ - - man_free1(man); - free(man); -} - - -struct man * -man_alloc(struct regset *regs, void *data, mandocmsg msg) -{ - struct man *p; - - p = mandoc_calloc(1, sizeof(struct man)); - - man_hash_init(); - p->data = data; - p->msg = msg; - p->regs = regs; - - man_alloc1(p); - return(p); -} - - int -man_endparse(struct man *m) +man_parseln(struct roff_man *man, int ln, char *buf, int offs) { - assert( ! (MAN_HALT & m->flags)); - if (man_macroend(m)) - return(1); - m->flags |= MAN_HALT; - return(0); -} + if (man->last->type != ROFFT_EQN || ln > man->last->line) + man->flags |= MAN_NEWLINE; - -int -man_parseln(struct man *m, int ln, char *buf, int offs) -{ - - m->flags |= MAN_NEWLINE; - - assert( ! (MAN_HALT & m->flags)); - return(('.' == buf[offs] || '\'' == buf[offs]) ? - man_pmacro(m, ln, buf, offs) : - man_ptext(m, ln, buf, offs)); + return (roff_getcontrol(man->roff, buf, &offs) ? + man_pmacro(man, ln, buf, offs) : + man_ptext(man, ln, buf, offs)); } - static void -man_free1(struct man *man) +man_node_append(struct roff_man *man, struct roff_node *p) { - if (man->first) - man_node_delete(man, man->first); - if (man->meta.title) - free(man->meta.title); - if (man->meta.source) - free(man->meta.source); - if (man->meta.date) - free(man->meta.date); - if (man->meta.vol) - free(man->meta.vol); - if (man->meta.msec) - free(man->meta.msec); -} - - -static void -man_alloc1(struct man *m) -{ - - memset(&m->meta, 0, sizeof(struct man_meta)); - m->flags = 0; - m->last = mandoc_calloc(1, sizeof(struct man_node)); - m->first = m->last; - m->last->type = MAN_ROOT; - m->last->tok = MAN_MAX; - m->next = MAN_NEXT_CHILD; -} - - -static int -man_node_append(struct man *man, struct man_node *p) -{ - assert(man->last); assert(man->first); - assert(MAN_ROOT != p->type); + assert(p->type != ROFFT_ROOT); switch (man->next) { - case (MAN_NEXT_SIBLING): + case ROFF_NEXT_SIBLING: man->last->next = p; p->prev = man->last; p->parent = man->last->parent; break; - case (MAN_NEXT_CHILD): + case ROFF_NEXT_CHILD: man->last->child = p; p->parent = man->last; break; @@ -191,20 +103,21 @@ man_node_append(struct man *man, struct man_node *p) abort(); /* NOTREACHED */ } - + assert(p->parent); p->parent->nchild++; - if ( ! man_valid_pre(man, p)) - return(0); - switch (p->type) { - case (MAN_HEAD): - assert(MAN_BLOCK == p->parent->type); + case ROFFT_BLOCK: + if (p->tok == MAN_SH || p->tok == MAN_SS) + man->flags &= ~MAN_LITERAL; + break; + case ROFFT_HEAD: + assert(p->parent->type == ROFFT_BLOCK); p->parent->head = p; break; - case (MAN_BODY): - assert(MAN_BLOCK == p->parent->type); + case ROFFT_BODY: + assert(p->parent->type == ROFFT_BLOCK); p->parent->body = p; break; default: @@ -214,174 +127,152 @@ man_node_append(struct man *man, struct man_node *p) man->last = p; switch (p->type) { - case (MAN_TBL): + case ROFFT_TBL: /* FALLTHROUGH */ - case (MAN_TEXT): - if ( ! man_valid_post(man)) - return(0); + case ROFFT_TEXT: + man_valid_post(man); break; default: break; } - - return(1); } - -static struct man_node * -man_node_alloc(struct man *m, int line, int pos, - enum man_type type, enum mant tok) +static struct roff_node * +man_node_alloc(struct roff_man *man, int line, int pos, + enum roff_type type, int tok) { - struct man_node *p; + struct roff_node *p; - p = mandoc_calloc(1, sizeof(struct man_node)); + p = mandoc_calloc(1, sizeof(*p)); p->line = line; p->pos = pos; p->type = type; p->tok = tok; - if (MAN_NEWLINE & m->flags) + if (man->flags & MAN_NEWLINE) p->flags |= MAN_LINE; - m->flags &= ~MAN_NEWLINE; + man->flags &= ~MAN_NEWLINE; return(p); } - -int -man_elem_alloc(struct man *m, int line, int pos, enum mant tok) +void +man_elem_alloc(struct roff_man *man, int line, int pos, int tok) { - struct man_node *p; + struct roff_node *p; - p = man_node_alloc(m, line, pos, MAN_ELEM, tok); - if ( ! man_node_append(m, p)) - return(0); - m->next = MAN_NEXT_CHILD; - return(1); + p = man_node_alloc(man, line, pos, ROFFT_ELEM, tok); + man_node_append(man, p); + man->next = ROFF_NEXT_CHILD; } - -int -man_head_alloc(struct man *m, int line, int pos, enum mant tok) +void +man_head_alloc(struct roff_man *man, int line, int pos, int tok) { - struct man_node *p; + struct roff_node *p; - p = man_node_alloc(m, line, pos, MAN_HEAD, tok); - if ( ! man_node_append(m, p)) - return(0); - m->next = MAN_NEXT_CHILD; - return(1); + p = man_node_alloc(man, line, pos, ROFFT_HEAD, tok); + man_node_append(man, p); + man->next = ROFF_NEXT_CHILD; } - -int -man_body_alloc(struct man *m, int line, int pos, enum mant tok) +void +man_body_alloc(struct roff_man *man, int line, int pos, int tok) { - struct man_node *p; + struct roff_node *p; - p = man_node_alloc(m, line, pos, MAN_BODY, tok); - if ( ! man_node_append(m, p)) - return(0); - m->next = MAN_NEXT_CHILD; - return(1); + p = man_node_alloc(man, line, pos, ROFFT_BODY, tok); + man_node_append(man, p); + man->next = ROFF_NEXT_CHILD; } - -int -man_block_alloc(struct man *m, int line, int pos, enum mant tok) +void +man_block_alloc(struct roff_man *man, int line, int pos, int tok) { - struct man_node *p; + struct roff_node *p; - p = man_node_alloc(m, line, pos, MAN_BLOCK, tok); - if ( ! man_node_append(m, p)) - return(0); - m->next = MAN_NEXT_CHILD; - return(1); + p = man_node_alloc(man, line, pos, ROFFT_BLOCK, tok); + man_node_append(man, p); + man->next = ROFF_NEXT_CHILD; } -int -man_word_alloc(struct man *m, int line, int pos, const char *word) +void +man_word_alloc(struct roff_man *man, int line, int pos, const char *word) { - struct man_node *n; - size_t sv, len; + struct roff_node *n; - len = strlen(word); + n = man_node_alloc(man, line, pos, ROFFT_TEXT, MAN_MAX); + n->string = roff_strdup(man->roff, word); + man_node_append(man, n); + man->next = ROFF_NEXT_SIBLING; +} - n = man_node_alloc(m, line, pos, MAN_TEXT, MAN_MAX); - n->string = mandoc_malloc(len + 1); - sv = strlcpy(n->string, word, len + 1); +void +man_word_append(struct roff_man *man, const char *word) +{ + struct roff_node *n; + char *addstr, *newstr; - /* Prohibit truncation. */ - assert(sv < len + 1); - - if ( ! man_node_append(m, n)) - return(0); - - m->next = MAN_NEXT_SIBLING; - return(1); + n = man->last; + addstr = roff_strdup(man->roff, word); + mandoc_asprintf(&newstr, "%s %s", n->string, addstr); + free(addstr); + free(n->string); + n->string = newstr; + man->next = ROFF_NEXT_SIBLING; } - /* * Free all of the resources held by a node. This does NOT unlink a * node from its context; for that, see man_node_unlink(). */ static void -man_node_free(struct man_node *p) +man_node_free(struct roff_node *p) { - if (p->string) - free(p->string); + free(p->string); free(p); } - void -man_node_delete(struct man *m, struct man_node *p) +man_node_delete(struct roff_man *man, struct roff_node *p) { while (p->child) - man_node_delete(m, p->child); + man_node_delete(man, p->child); - man_node_unlink(m, p); + man_node_unlink(man, p); man_node_free(p); } -int -man_addeqn(struct man *m, const struct eqn *ep) +void +man_addeqn(struct roff_man *man, const struct eqn *ep) { - struct man_node *n; + struct roff_node *n; - assert( ! (MAN_HALT & m->flags)); - - n = man_node_alloc(m, ep->line, ep->pos, MAN_EQN, MAN_MAX); + n = man_node_alloc(man, ep->ln, ep->pos, ROFFT_EQN, MAN_MAX); n->eqn = ep; - - if ( ! man_node_append(m, n)) - return(0); - - m->next = MAN_NEXT_SIBLING; - return(man_descope(m, ep->line, ep->pos)); + if (ep->ln > man->last->line) + n->flags |= MAN_LINE; + man_node_append(man, n); + man->next = ROFF_NEXT_SIBLING; + man_descope(man, ep->ln, ep->pos); } -int -man_addspan(struct man *m, const struct tbl_span *sp) +void +man_addspan(struct roff_man *man, const struct tbl_span *sp) { - struct man_node *n; + struct roff_node *n; - assert( ! (MAN_HALT & m->flags)); - - n = man_node_alloc(m, sp->line, 0, MAN_TBL, MAN_MAX); + man_breakscope(man, MAN_MAX); + n = man_node_alloc(man, sp->line, 0, ROFFT_TBL, MAN_MAX); n->span = sp; - - if ( ! man_node_append(m, n)) - return(0); - - m->next = MAN_NEXT_SIBLING; - return(man_descope(m, sp->line, 0)); + man_node_append(man, n); + man->next = ROFF_NEXT_SIBLING; + man_descope(man, sp->line, 0); } -static int -man_descope(struct man *m, int line, int offs) +static void +man_descope(struct roff_man *man, int line, int offs) { /* * Co-ordinate what happens with having a next-line scope open: @@ -389,59 +280,51 @@ man_descope(struct man *m, int line, int offs) * out the block scope (also if applicable). */ - if (MAN_ELINE & m->flags) { - m->flags &= ~MAN_ELINE; - if ( ! man_unscope(m, m->last->parent, MANDOCERR_MAX)) - return(0); + if (man->flags & MAN_ELINE) { + man->flags &= ~MAN_ELINE; + man_unscope(man, man->last->parent); } - - if ( ! (MAN_BLINE & m->flags)) - return(1); - m->flags &= ~MAN_BLINE; - - if ( ! man_unscope(m, m->last->parent, MANDOCERR_MAX)) - return(0); - return(man_body_alloc(m, line, offs, m->last->tok)); + if ( ! (man->flags & MAN_BLINE)) + return; + man->flags &= ~MAN_BLINE; + man_unscope(man, man->last->parent); + man_body_alloc(man, line, offs, man->last->tok); } - static int -man_ptext(struct man *m, int line, char *buf, int offs) +man_ptext(struct roff_man *man, int line, char *buf, int offs) { int i; - /* Ignore bogus comments. */ + /* Literal free-form text whitespace is preserved. */ - if ('\\' == buf[offs] && - '.' == buf[offs + 1] && - '"' == buf[offs + 2]) { - man_pmsg(m, line, offs, MANDOCERR_BADCOMMENT); + if (man->flags & MAN_LITERAL) { + man_word_alloc(man, line, offs, buf + offs); + man_descope(man, line, offs); return(1); } - /* Literal free-form text whitespace is preserved. */ - - if (MAN_LITERAL & m->flags) { - if ( ! man_word_alloc(m, line, offs, buf + offs)) - return(0); - return(man_descope(m, line, offs)); - } - - /* Pump blank lines directly into the backend. */ - - for (i = offs; ' ' == buf[i]; i++) + for (i = offs; buf[i] == ' '; i++) /* Skip leading whitespace. */ ; - if ('\0' == buf[i]) { + /* + * Blank lines are ignored right after headings + * but add a single vertical space elsewhere. + */ + + if (buf[i] == '\0') { /* Allocate a blank entry. */ - if ( ! man_word_alloc(m, line, offs, "")) - return(0); - return(man_descope(m, line, offs)); + if (man->last->tok != MAN_SH && + man->last->tok != MAN_SS) { + man_elem_alloc(man, line, offs, MAN_sp); + man->next = ROFF_NEXT_SIBLING; + } + return(1); } - /* + /* * Warn if the last un-escaped character is whitespace. Then - * strip away the remaining spaces (tabs stay!). + * strip away the remaining spaces (tabs stay!). */ i = (int)strlen(buf); @@ -449,7 +332,8 @@ man_ptext(struct man *m, int line, char *buf, int offs if (' ' == buf[i - 1] || '\t' == buf[i - 1]) { if (i > 1 && '\\' != buf[i - 2]) - man_pmsg(m, line, i - 1, MANDOCERR_EOLNSPACE); + mandoc_msg(MANDOCERR_SPACE_EOL, man->parse, + line, i - 1, NULL); for (--i; i && ' ' == buf[i]; i--) /* Spin back to non-space. */ ; @@ -459,10 +343,8 @@ man_ptext(struct man *m, int line, char *buf, int offs buf[i] = '\0'; } + man_word_alloc(man, line, offs, buf + offs); - if ( ! man_word_alloc(m, line, offs, buf + offs)) - return(0); - /* * End-of-sentence check. If the last character is an unescaped * EOS character, then flag the node as being the end of a @@ -470,178 +352,175 @@ man_ptext(struct man *m, int line, char *buf, int offs */ assert(i); - if (mandoc_eos(buf, (size_t)i, 0)) - m->last->flags |= MAN_EOS; + if (mandoc_eos(buf, (size_t)i)) + man->last->flags |= MAN_EOS; - return(man_descope(m, line, offs)); + man_descope(man, line, offs); + return(1); } - static int -man_pmacro(struct man *m, int ln, char *buf, int offs) +man_pmacro(struct roff_man *man, int ln, char *buf, int offs) { - int i, j, ppos; - enum mant tok; + struct roff_node *n; + const char *cp; + int tok; + int i, ppos; + int bline; char mac[5]; - struct man_node *n; - /* Comments and empties are quickly ignored. */ + ppos = offs; - offs++; - - if ('\0' == buf[offs]) - return(1); - - i = offs; - /* - * Skip whitespace between the control character and initial - * text. "Whitespace" is both spaces and tabs. + * Copy the first word into a nil-terminated buffer. + * Stop when a space, tab, escape, or eoln is encountered. */ - if (' ' == buf[i] || '\t' == buf[i]) { - i++; - while (buf[i] && (' ' == buf[i] || '\t' == buf[i])) - i++; - if ('\0' == buf[i]) - goto out; - } + i = 0; + while (i < 4 && strchr(" \t\\", buf[offs]) == NULL) + mac[i++] = buf[offs++]; - ppos = i; + mac[i] = '\0'; - /* - * Copy the first word into a nil-terminated buffer. - * Stop copying when a tab, space, or eoln is encountered. - */ + tok = (i > 0 && i < 4) ? man_hash_find(mac) : MAN_MAX; - j = 0; - while (j < 4 && '\0' != buf[i] && ' ' != buf[i] && '\t' != buf[i]) - mac[j++] = buf[i++]; - mac[j] = '\0'; - - tok = (j > 0 && j < 4) ? man_hash_find(mac) : MAN_MAX; - if (MAN_MAX == tok) { - man_vmsg(m, MANDOCERR_MACRO, ln, ppos, "%s", buf + ppos - 1); + if (tok == MAN_MAX) { + mandoc_msg(MANDOCERR_MACRO, man->parse, + ln, ppos, buf + ppos - 1); return(1); } - /* The macro is sane. Jump to the next word. */ + /* Skip a leading escape sequence or tab. */ - while (buf[i] && ' ' == buf[i]) - i++; + 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. */ + + while (buf[offs] && buf[offs] == ' ') + offs++; + + /* * Trailing whitespace. Note that tabs are allowed to be passed * into the parser as "text", so we only warn about spaces here. */ - if ('\0' == buf[i] && ' ' == buf[i - 1]) - man_pmsg(m, ln, i - 1, MANDOCERR_EOLNSPACE); + if (buf[offs] == '\0' && buf[offs - 1] == ' ') + mandoc_msg(MANDOCERR_SPACE_EOL, man->parse, + ln, offs - 1, NULL); - /* - * Remove prior ELINE macro, as it's being clobbered by a new - * macro. Note that NSCOPED macros do not close out ELINE - * macros---they don't print text---so we let those slip by. - */ - - if ( ! (MAN_NSCOPED & man_macros[tok].flags) && - m->flags & MAN_ELINE) { - n = m->last; - assert(MAN_TEXT != n->type); - - /* Remove repeated NSCOPED macros causing ELINE. */ - - if (MAN_NSCOPED & man_macros[n->tok].flags) - n = n->parent; - - man_vmsg(m, MANDOCERR_LINESCOPE, n->line, n->pos, - "%s", man_macronames[n->tok]); - - man_node_delete(m, n); - m->flags &= ~MAN_ELINE; - } - /* - * Save the fact that we're in the next-line for a block. In - * this way, embedded roff instructions can "remember" state - * when they exit. + * Some macros break next-line scopes; otherwise, remember + * whether we are in next-line scope for a block head. */ - if (MAN_BLINE & m->flags) - m->flags |= MAN_BPLINE; + man_breakscope(man, tok); + bline = man->flags & MAN_BLINE; /* Call to handler... */ assert(man_macros[tok].fp); - if ( ! (*man_macros[tok].fp)(m, tok, ln, ppos, &i, buf)) - goto err; + (*man_macros[tok].fp)(man, tok, ln, ppos, &offs, buf); -out: - /* - * We weren't in a block-line scope when entering the - * above-parsed macro, so return. - */ + /* In quick mode (for mandocdb), abort after the NAME section. */ - if ( ! (MAN_BPLINE & m->flags)) { - m->flags &= ~MAN_ILINE; - return(1); + if (man->quick && tok == MAN_SH) { + n = man->last; + if (n->type == ROFFT_BODY && + strcmp(n->prev->child->string, "NAME")) + return(2); } - m->flags &= ~MAN_BPLINE; /* - * If we're in a block scope, then allow this macro to slip by - * without closing scope around it. + * If we are in a next-line scope for a block head, + * close it out now and switch to the body, + * unless the next-line scope is allowed to continue. */ - if (MAN_ILINE & m->flags) { - m->flags &= ~MAN_ILINE; + if ( ! bline || man->flags & MAN_ELINE || + man_macros[tok].flags & MAN_NSCOPED) return(1); - } - /* - * If we've opened a new next-line element scope, then return - * now, as the next line will close out the block scope. - */ + assert(man->flags & MAN_BLINE); + man->flags &= ~MAN_BLINE; - if (MAN_ELINE & m->flags) - return(1); + man_unscope(man, man->last->parent); + man_body_alloc(man, ln, ppos, man->last->tok); + return(1); +} - /* Close out the block scope opened in the prior line. */ +void +man_breakscope(struct roff_man *man, int tok) +{ + struct roff_node *n; - assert(MAN_BLINE & m->flags); - m->flags &= ~MAN_BLINE; + /* + * An element next line scope is open, + * and the new macro is not allowed inside elements. + * Delete the element that is being broken. + */ - if ( ! man_unscope(m, m->last->parent, MANDOCERR_MAX)) - return(0); - return(man_body_alloc(m, ln, offs, m->last->tok)); + if (man->flags & MAN_ELINE && (tok == MAN_MAX || + ! (man_macros[tok].flags & MAN_NSCOPED))) { + n = man->last; + assert(n->type != ROFFT_TEXT); + if (man_macros[n->tok].flags & MAN_NSCOPED) + n = n->parent; -err: /* Error out. */ + mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse, + n->line, n->pos, "%s breaks %s", + tok == MAN_MAX ? "TS" : man_macronames[tok], + man_macronames[n->tok]); - m->flags |= MAN_HALT; - return(0); -} + man_node_delete(man, n); + man->flags &= ~MAN_ELINE; + } + /* + * A block header next line scope is open, + * and the new macro is not allowed inside block headers. + * Delete the block that is being broken. + */ -int -man_vmsg(struct man *man, enum mandocerr t, - int ln, int pos, const char *fmt, ...) -{ - char buf[256]; - va_list ap; + if (man->flags & MAN_BLINE && (tok == MAN_MAX || + man_macros[tok].flags & MAN_BSCOPE)) { + n = man->last; + if (n->type == ROFFT_TEXT) + n = n->parent; + if ( ! (man_macros[n->tok].flags & MAN_BSCOPE)) + n = n->parent; - va_start(ap, fmt); - vsnprintf(buf, sizeof(buf) - 1, fmt, ap); - va_end(ap); - return((*man->msg)(t, man->data, ln, pos, buf)); -} + assert(n->type == ROFFT_HEAD); + n = n->parent; + assert(n->type == ROFFT_BLOCK); + assert(man_macros[n->tok].flags & MAN_SCOPED); + mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse, + n->line, n->pos, "%s breaks %s", + tok == MAN_MAX ? "TS" : man_macronames[tok], + man_macronames[n->tok]); + man_node_delete(man, n); + man->flags &= ~MAN_BLINE; + } +} + /* - * Unlink a node from its context. If "m" is provided, the last parse + * Unlink a node from its context. If "man" is provided, the last parse * point will also be adjusted accordingly. */ static void -man_node_unlink(struct man *m, struct man_node *n) +man_node_unlink(struct roff_man *man, struct roff_node *n) { /* Adjust siblings. */ @@ -661,18 +540,72 @@ man_node_unlink(struct man *m, struct man_node *n) /* Adjust parse point, if applicable. */ - if (m && m->last == n) { + if (man && man->last == n) { /*XXX: this can occur when bailing from validation. */ /*assert(NULL == n->next);*/ if (n->prev) { - m->last = n->prev; - m->next = MAN_NEXT_SIBLING; + man->last = n->prev; + man->next = ROFF_NEXT_SIBLING; } else { - m->last = n->parent; - m->next = MAN_NEXT_CHILD; + man->last = n->parent; + man->next = ROFF_NEXT_CHILD; } } - if (m && m->first == n) - m->first = NULL; + if (man && man->first == n) + man->first = NULL; +} + +const struct mparse * +man_mparse(const struct roff_man *man) +{ + + assert(man && man->parse); + return(man->parse); +} + +void +man_deroff(char **dest, const struct roff_node *n) +{ + char *cp; + size_t sz; + + if (n->type != ROFFT_TEXT) { + for (n = n->child; n; n = n->next) + man_deroff(dest, n); + return; + } + + /* Skip leading whitespace and escape sequences. */ + + cp = n->string; + while ('\0' != *cp) { + if ('\\' == *cp) { + cp++; + mandoc_escape((const char **)&cp, NULL, NULL); + } else if (isspace((unsigned char)*cp)) + cp++; + else + break; + } + + /* Skip trailing whitespace. */ + + for (sz = strlen(cp); sz; sz--) + if (0 == isspace((unsigned char)cp[sz-1])) + break; + + /* Skip empty strings. */ + + if (0 == sz) + return; + + if (NULL == *dest) { + *dest = mandoc_strndup(cp, sz); + return; + } + + mandoc_asprintf(&cp, "%s %*s", *dest, (int)sz, cp); + free(*dest); + *dest = cp; }