mandoc/man.c - diff

Return to man.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/man.c between version 1.181 and 1.186

version 1.181, 2018/12/14 05:18:02

version 1.186, 2018/12/31 10:04:39

Line 103 man_ptext(struct roff_man *man, int line, char *buf, i

int i;

char *ep;

/* Literal free-form text whitespace is preserved. */

/* In no-fill mode, whitespace is preserved on text lines. */

if (man->flags & MAN_LITERAL) {

if (man->flags & ROFF_NOFILL) {

roff_word_alloc(man, line, offs, buf + offs);

man_descope(man, line, offs, buf + offs);

return 1;

Line 308 man_breakscope(struct roff_man *man, int tok)

if (man->flags & MAN_BLINE &&

(tok == MAN_nf || tok == MAN_fi) &&

(tok == ROFF_nf || tok == ROFF_fi) &&

(man->last->tok == MAN_SH || man->last->tok == MAN_SS)) {

n = man->last;

man_unscope(man, n);

Line 322 man_breakscope(struct roff_man *man, int tok)

* Delete the block that is being broken.

if (man->flags & MAN_BLINE && (tok < MAN_TH ||

if (man->flags & MAN_BLINE && tok != ROFF_nf && tok != ROFF_fi &&

man_macro(tok)->flags & MAN_XSCOPE)) {

(tok < MAN_TH || man_macro(tok)->flags & MAN_XSCOPE)) {

n = man->last;

if (n->type == ROFFT_TEXT)

n = n->parent;

Line 342 man_breakscope(struct roff_man *man, int tok)

roff_node_delete(man, n);

man->flags &= ~MAN_BLINE;

}

void

man_state(struct roff_man *man, struct roff_node *n)

{

switch(n->tok) {

case MAN_nf:

case MAN_EX:

if (man->flags & MAN_LITERAL && ! (n->flags & NODE_VALID))

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, n->line, n->pos, "fi");

man->flags &= ~MAN_LITERAL;

break;

default:

break;

}

man->last->flags |= NODE_VALID;

}

void

man_validate(struct roff_man *man)

{

man->last = man->first;

man_node_validate(man);

man->flags &= ~MAN_LITERAL;

}

CVSweb