=================================================================== RCS file: /cvs/mandoc/man.c,v retrieving revision 1.175 retrieving revision 1.179 diff -u -p -r1.175 -r1.179 --- mandoc/man.c 2017/06/17 13:06:16 1.175 +++ mandoc/man.c 2018/08/25 12:33:03 1.179 @@ -1,7 +1,7 @@ -/* $Id: man.c,v 1.175 2017/06/17 13:06:16 schwarze Exp $ */ +/* $Id: man.c,v 1.179 2018/08/25 12:33:03 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons - * Copyright (c) 2013, 2014, 2015, 2017 Ingo Schwarze + * Copyright (c) 2013,2014,2015,2017,2018 Ingo Schwarze * Copyright (c) 2011 Joerg Sonnenberger * * Permission to use, copy, modify, and distribute this software for any @@ -35,7 +35,8 @@ #include "roff_int.h" #include "libman.h" -static void man_descope(struct roff_man *, int, int); +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); @@ -52,9 +53,32 @@ man_parseln(struct roff_man *man, int ln, char *buf, i man_ptext(man, ln, buf, offs); } +/* + * If the string ends with \c, return a pointer to the backslash. + * Otherwise, return NULL. + */ +static char * +man_hasc(char *start) +{ + char *cp, *ep; + + ep = strchr(start, '\0') - 2; + if (ep < start || ep[0] != '\\' || ep[1] != 'c') + return NULL; + for (cp = ep; cp > start; cp--) + if (cp[-1] != '\\') + break; + return (ep - cp) % 2 ? NULL : ep; +} + static void -man_descope(struct roff_man *man, int line, int offs) +man_descope(struct roff_man *man, int line, int offs, char *start) { + /* Trailing \c keeps next-line scope open. */ + + if (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 @@ -76,14 +100,13 @@ static int man_ptext(struct roff_man *man, int line, char *buf, int offs) { int i; - const char *cp, *sp; char *ep; /* Literal free-form text whitespace is preserved. */ if (man->flags & MAN_LITERAL) { roff_word_alloc(man, line, offs, buf + offs); - man_descope(man, line, offs); + man_descope(man, line, offs, buf + offs); return 1; } @@ -104,20 +127,10 @@ man_ptext(struct roff_man *man, int line, char *buf, i } if (man->last->tok == MAN_SH || man->last->tok == MAN_SS) return 1; - switch (man->last->type) { - case ROFFT_TEXT: - sp = man->last->string; - cp = ep = strchr(sp, '\0') - 2; - if (cp < sp || cp[0] != '\\' || cp[1] != 'c') - break; - while (cp > sp && cp[-1] == '\\') - cp--; - if ((ep - cp) % 2) - break; + if (man->last->type == ROFFT_TEXT && + ((ep = man_hasc(man->last->string)) != NULL)) { *ep = '\0'; return 1; - default: - break; } roff_elem_alloc(man, line, offs, ROFF_sp); man->next = ROFF_NEXT_SIBLING; @@ -157,7 +170,7 @@ man_ptext(struct roff_man *man, int line, char *buf, i if (mandoc_eos(buf, (size_t)i)) man->last->flags |= NODE_EOS; - man_descope(man, line, offs); + man_descope(man, line, offs, buf + offs); return 1; } @@ -238,8 +251,8 @@ man_pmacro(struct roff_man *man, int ln, char *buf, in /* Call to handler... */ - assert(man_macros[tok].fp); - (*man_macros[tok].fp)(man, tok, ln, ppos, &offs, buf); + 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. */ @@ -257,7 +270,7 @@ man_pmacro(struct roff_man *man, int ln, char *buf, in */ if ( ! bline || man->flags & MAN_ELINE || - man_macros[tok].flags & MAN_NSCOPED) + man_macro(tok)->flags & MAN_NSCOPED) return 1; assert(man->flags & MAN_BLINE); @@ -280,11 +293,13 @@ man_breakscope(struct roff_man *man, int tok) */ if (man->flags & MAN_ELINE && (tok < MAN_TH || - ! (man_macros[tok].flags & MAN_NSCOPED))) { + (man_macro(tok)->flags & MAN_NSCOPED) == 0)) { n = man->last; - assert(n->type != ROFFT_TEXT); - if (man_macros[n->tok].flags & MAN_NSCOPED) + if (n->type == ROFFT_TEXT) n = n->parent; + if (n->tok < MAN_TH || + man_macro(n->tok)->flags & MAN_NSCOPED) + n = n->parent; mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse, n->line, n->pos, "%s breaks %s", @@ -315,17 +330,18 @@ man_breakscope(struct roff_man *man, int tok) */ if (man->flags & MAN_BLINE && (tok < MAN_TH || - man_macros[tok].flags & MAN_BSCOPE)) { + man_macro(tok)->flags & MAN_BSCOPE)) { n = man->last; if (n->type == ROFFT_TEXT) n = n->parent; - if ( ! (man_macros[n->tok].flags & MAN_BSCOPE)) + if (n->tok < MAN_TH || + (man_macro(n->tok)->flags & MAN_BSCOPE) == 0) n = n->parent; assert(n->type == ROFFT_HEAD); n = n->parent; assert(n->type == ROFFT_BLOCK); - assert(man_macros[n->tok].flags & MAN_SCOPED); + assert(man_macro(n->tok)->flags & MAN_SCOPED); mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse, n->line, n->pos, "%s breaks %s", @@ -334,14 +350,6 @@ man_breakscope(struct roff_man *man, int tok) roff_node_delete(man, n); man->flags &= ~MAN_BLINE; } -} - -const struct mparse * -man_mparse(const struct roff_man *man) -{ - - assert(man && man->parse); - return man->parse; } void