version 1.170, 2017/04/29 12:45:41 |
version 1.174, 2017/06/03 15:55:24 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2013, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2011 Joerg Sonnenberger <joerg@netbsd.org> |
* Copyright (c) 2011 Joerg Sonnenberger <joerg@netbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
Line 89 man_ptext(struct roff_man *man, int line, char *buf, i |
|
Line 89 man_ptext(struct roff_man *man, int line, char *buf, i |
|
/* Skip leading whitespace. */ ; |
/* Skip leading whitespace. */ ; |
|
|
/* |
/* |
* Blank lines are ignored right after headings |
* Blank lines are ignored in next line scope and right |
* but add a single vertical space elsewhere. |
* after headings but add a single vertical space elsewhere. |
*/ |
*/ |
|
|
if (buf[i] == '\0') { |
if (buf[i] == '\0') { |
/* Allocate a blank entry. */ |
if (man->flags & (MAN_ELINE | MAN_BLINE)) |
if (man->last->tok != MAN_SH && |
mandoc_msg(MANDOCERR_BLK_BLANK, man->parse, |
|
line, 0, NULL); |
|
else if (man->last->tok != MAN_SH && |
man->last->tok != MAN_SS) { |
man->last->tok != MAN_SS) { |
roff_elem_alloc(man, line, offs, MAN_sp); |
roff_elem_alloc(man, line, offs, ROFF_sp); |
man->next = ROFF_NEXT_SIBLING; |
man->next = ROFF_NEXT_SIBLING; |
} |
} |
return 1; |
return 1; |
Line 201 man_pmacro(struct roff_man *man, int ln, char *buf, in |
|
Line 203 man_pmacro(struct roff_man *man, int ln, char *buf, in |
|
man_breakscope(man, tok); |
man_breakscope(man, tok); |
bline = man->flags & MAN_BLINE; |
bline = man->flags & MAN_BLINE; |
|
|
|
/* |
|
* If the line in next-line scope ends with \c, keep the |
|
* next-line scope open for the subsequent input line. |
|
* That is not at all portable, only groff >= 1.22.4 |
|
* does it, but *if* this weird idiom occurs in a manual |
|
* 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; |
|
} |
|
|
/* Call to handler... */ |
/* Call to handler... */ |
|
|
assert(man_macros[tok].fp); |
assert(man_macros[tok].fp); |
Line 244 man_breakscope(struct roff_man *man, int tok) |
|
Line 260 man_breakscope(struct roff_man *man, int tok) |
|
* Delete the element that is being broken. |
* Delete the element that is being broken. |
*/ |
*/ |
|
|
if (man->flags & MAN_ELINE && (tok == TOKEN_NONE || |
if (man->flags & MAN_ELINE && (tok < MAN_TH || |
! (man_macros[tok].flags & MAN_NSCOPED))) { |
! (man_macros[tok].flags & MAN_NSCOPED))) { |
n = man->last; |
n = man->last; |
assert(n->type != ROFFT_TEXT); |
assert(n->type != ROFFT_TEXT); |
Line 253 man_breakscope(struct roff_man *man, int tok) |
|
Line 269 man_breakscope(struct roff_man *man, int tok) |
|
|
|
mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse, |
mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse, |
n->line, n->pos, "%s breaks %s", |
n->line, n->pos, "%s breaks %s", |
tok == TOKEN_NONE ? "TS" : roff_name[tok], |
roff_name[tok], roff_name[n->tok]); |
roff_name[n->tok]); |
|
|
|
roff_node_delete(man, n); |
roff_node_delete(man, n); |
man->flags &= ~MAN_ELINE; |
man->flags &= ~MAN_ELINE; |
Line 280 man_breakscope(struct roff_man *man, int tok) |
|
Line 295 man_breakscope(struct roff_man *man, int tok) |
|
* Delete the block that is being broken. |
* Delete the block that is being broken. |
*/ |
*/ |
|
|
if (man->flags & MAN_BLINE && (tok == TOKEN_NONE || |
if (man->flags & MAN_BLINE && (tok < MAN_TH || |
man_macros[tok].flags & MAN_BSCOPE)) { |
man_macros[tok].flags & MAN_BSCOPE)) { |
n = man->last; |
n = man->last; |
if (n->type == ROFFT_TEXT) |
if (n->type == ROFFT_TEXT) |
Line 295 man_breakscope(struct roff_man *man, int tok) |
|
Line 310 man_breakscope(struct roff_man *man, int tok) |
|
|
|
mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse, |
mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse, |
n->line, n->pos, "%s breaks %s", |
n->line, n->pos, "%s breaks %s", |
tok == TOKEN_NONE ? "TS" : roff_name[tok], |
roff_name[tok], roff_name[n->tok]); |
roff_name[n->tok]); |
|
|
|
roff_node_delete(man, n); |
roff_node_delete(man, n); |
man->flags &= ~MAN_BLINE; |
man->flags &= ~MAN_BLINE; |