=================================================================== RCS file: /cvs/mandoc/man.c,v retrieving revision 1.179 retrieving revision 1.182 diff -u -p -r1.179 -r1.182 --- mandoc/man.c 2018/08/25 12:33:03 1.179 +++ mandoc/man.c 2018/12/30 00:49:55 1.182 @@ -1,4 +1,4 @@ -/* $Id: man.c,v 1.179 2018/08/25 12:33:03 schwarze Exp $ */ +/* $Id: man.c,v 1.182 2018/12/30 00:49:55 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2013,2014,2015,2017,2018 Ingo Schwarze @@ -35,7 +35,6 @@ #include "roff_int.h" #include "libman.h" -static void man_descope(struct roff_man *, int, int, char *); static char *man_hasc(char *); static int man_ptext(struct roff_man *, int, char *, int); static int man_pmacro(struct roff_man *, int, char *, int); @@ -71,23 +70,25 @@ man_hasc(char *start) return (ep - cp) % 2 ? NULL : ep; } -static void +void man_descope(struct roff_man *man, int line, int offs, char *start) { /* Trailing \c keeps next-line scope open. */ - if (man_hasc(start) != NULL) + if (start != NULL && man_hasc(start) != NULL) return; /* * Co-ordinate what happens with having a next-line scope open: - * first close out the element scope (if applicable), then close - * out the block scope (also if applicable). + * first close out the element scopes (if applicable), + * then close out the block scope (also if applicable). */ if (man->flags & MAN_ELINE) { + while (man->last->parent->type != ROFFT_ROOT && + man_macro(man->last->parent->tok)->flags & MAN_ESCOPED) + man_unscope(man, man->last->parent); man->flags &= ~MAN_ELINE; - man_unscope(man, man->last->parent); } if ( ! (man->flags & MAN_BLINE)) return; @@ -121,8 +122,7 @@ man_ptext(struct roff_man *man, int line, char *buf, i if (buf[i] == '\0') { if (man->flags & (MAN_ELINE | MAN_BLINE)) { - mandoc_msg(MANDOCERR_BLK_BLANK, man->parse, - line, 0, NULL); + mandoc_msg(MANDOCERR_BLK_BLANK, line, 0, NULL); return 1; } if (man->last->tok == MAN_SH || man->last->tok == MAN_SS) @@ -147,8 +147,7 @@ man_ptext(struct roff_man *man, int line, char *buf, i if (' ' == buf[i - 1] || '\t' == buf[i - 1]) { if (i > 1 && '\\' != buf[i - 2]) - mandoc_msg(MANDOCERR_SPACE_EOL, man->parse, - line, i - 1, NULL); + mandoc_msg(MANDOCERR_SPACE_EOL, line, i - 1, NULL); for (--i; i && ' ' == buf[i]; i--) /* Spin back to non-space. */ ; @@ -193,8 +192,7 @@ man_pmacro(struct roff_man *man, int ln, char *buf, in if (sz > 0 && sz < 4) tok = roffhash_find(man->manmac, buf + ppos, sz); if (tok == TOKEN_NONE) { - mandoc_msg(MANDOCERR_MACRO, man->parse, - ln, ppos, buf + ppos - 1); + mandoc_msg(MANDOCERR_MACRO, ln, ppos, "%s", buf + ppos - 1); return 1; } @@ -224,8 +222,7 @@ man_pmacro(struct roff_man *man, int ln, char *buf, in */ if (buf[offs] == '\0' && buf[offs - 1] == ' ') - mandoc_msg(MANDOCERR_SPACE_EOL, man->parse, - ln, offs - 1, NULL); + mandoc_msg(MANDOCERR_SPACE_EOL, ln, offs - 1, NULL); /* * Some macros break next-line scopes; otherwise, remember @@ -243,15 +240,11 @@ man_pmacro(struct roff_man *man, int ln, char *buf, in * page, that's very likely what the author intended. */ - if (bline) { - cp = strchr(buf + offs, '\0') - 2; - if (cp >= buf && cp[0] == '\\' && cp[1] == 'c') - bline = 0; - } + if (bline && man_hasc(buf + offs)) + bline = 0; /* Call to handler... */ - assert(man_macro(tok)->fp != NULL); (*man_macro(tok)->fp)(man, tok, ln, ppos, &offs, buf); /* In quick mode (for mandocdb), abort after the NAME section. */ @@ -269,13 +262,13 @@ man_pmacro(struct roff_man *man, int ln, char *buf, in * unless the next-line scope is allowed to continue. */ - if ( ! bline || man->flags & MAN_ELINE || + if (bline == 0 || + (man->flags & MAN_BLINE) == 0 || + man->flags & MAN_ELINE || man_macro(tok)->flags & MAN_NSCOPED) return 1; - assert(man->flags & MAN_BLINE); man->flags &= ~MAN_BLINE; - man_unscope(man, man->last->parent); roff_body_alloc(man, ln, ppos, man->last->tok); return 1; @@ -298,12 +291,12 @@ man_breakscope(struct roff_man *man, int tok) if (n->type == ROFFT_TEXT) n = n->parent; if (n->tok < MAN_TH || - man_macro(n->tok)->flags & MAN_NSCOPED) + (man_macro(n->tok)->flags & (MAN_NSCOPED | MAN_ESCOPED)) + == MAN_NSCOPED) n = n->parent; - mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse, - n->line, n->pos, "%s breaks %s", - roff_name[tok], roff_name[n->tok]); + mandoc_msg(MANDOCERR_BLK_LINE, n->line, n->pos, + "%s breaks %s", roff_name[tok], roff_name[n->tok]); roff_node_delete(man, n); man->flags &= ~MAN_ELINE; @@ -330,22 +323,21 @@ man_breakscope(struct roff_man *man, int tok) */ if (man->flags & MAN_BLINE && (tok < MAN_TH || - man_macro(tok)->flags & MAN_BSCOPE)) { + man_macro(tok)->flags & MAN_XSCOPE)) { n = man->last; if (n->type == ROFFT_TEXT) n = n->parent; if (n->tok < MAN_TH || - (man_macro(n->tok)->flags & MAN_BSCOPE) == 0) + (man_macro(n->tok)->flags & MAN_XSCOPE) == 0) n = n->parent; assert(n->type == ROFFT_HEAD); n = n->parent; assert(n->type == ROFFT_BLOCK); - assert(man_macro(n->tok)->flags & MAN_SCOPED); + assert(man_macro(n->tok)->flags & MAN_BSCOPED); - mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse, - n->line, n->pos, "%s breaks %s", - roff_name[tok], roff_name[n->tok]); + mandoc_msg(MANDOCERR_BLK_LINE, n->line, n->pos, + "%s breaks %s", roff_name[tok], roff_name[n->tok]); roff_node_delete(man, n); man->flags &= ~MAN_BLINE; @@ -360,16 +352,14 @@ man_state(struct roff_man *man, struct roff_node *n) case MAN_nf: case MAN_EX: if (man->flags & MAN_LITERAL && ! (n->flags & NODE_VALID)) - mandoc_msg(MANDOCERR_NF_SKIP, man->parse, - n->line, n->pos, "nf"); + mandoc_msg(MANDOCERR_NF_SKIP, n->line, n->pos, "nf"); man->flags |= MAN_LITERAL; break; case MAN_fi: case MAN_EE: if ( ! (man->flags & MAN_LITERAL) && ! (n->flags & NODE_VALID)) - mandoc_msg(MANDOCERR_FI_SKIP, man->parse, - n->line, n->pos, "fi"); + mandoc_msg(MANDOCERR_FI_SKIP, n->line, n->pos, "fi"); man->flags &= ~MAN_LITERAL; break; default: @@ -382,7 +372,7 @@ void man_validate(struct roff_man *man) { - man->last = man->first; + man->last = man->meta.first; man_node_validate(man); man->flags &= ~MAN_LITERAL; }