version 1.183, 2018/12/31 04:55:46 |
version 1.185, 2018/12/31 08:38:21 |
Line 103 man_ptext(struct roff_man *man, int line, char *buf, i |
|
Line 103 man_ptext(struct roff_man *man, int line, char *buf, i |
|
int i; |
int i; |
char *ep; |
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); |
roff_word_alloc(man, line, offs, buf + offs); |
man_descope(man, line, offs, buf + offs); |
man_descope(man, line, offs, buf + offs); |
return 1; |
return 1; |
Line 308 man_breakscope(struct roff_man *man, int tok) |
|
Line 308 man_breakscope(struct roff_man *man, int tok) |
|
*/ |
*/ |
|
|
if (man->flags & MAN_BLINE && |
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)) { |
(man->last->tok == MAN_SH || man->last->tok == MAN_SS)) { |
n = man->last; |
n = man->last; |
man_unscope(man, n); |
man_unscope(man, n); |
Line 322 man_breakscope(struct roff_man *man, int tok) |
|
Line 322 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 < 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; |
n = man->last; |
if (n->type == ROFFT_TEXT) |
if (n->type == ROFFT_TEXT) |
n = n->parent; |
n = n->parent; |
Line 349 man_state(struct roff_man *man, struct roff_node *n) |
|
Line 349 man_state(struct roff_man *man, struct roff_node *n) |
|
{ |
{ |
|
|
switch(n->tok) { |
switch(n->tok) { |
case MAN_nf: |
case ROFF_nf: |
case MAN_EX: |
case MAN_EX: |
if (man->flags & MAN_LITERAL && ! (n->flags & NODE_VALID)) |
man->flags |= ROFF_NOFILL; |
mandoc_msg(MANDOCERR_NF_SKIP, n->line, n->pos, "nf"); |
|
man->flags |= MAN_LITERAL; |
|
break; |
break; |
case MAN_fi: |
case ROFF_fi: |
case MAN_EE: |
case MAN_EE: |
if ( ! (man->flags & MAN_LITERAL) && |
man->flags &= ~ROFF_NOFILL; |
! (n->flags & NODE_VALID)) |
|
mandoc_msg(MANDOCERR_FI_SKIP, n->line, n->pos, "fi"); |
|
man->flags &= ~MAN_LITERAL; |
|
break; |
break; |
default: |
default: |
break; |
break; |