version 1.163, 2015/04/23 16:17:44 |
version 1.166, 2015/10/22 21:54:23 |
Line 62 man_parseln(struct roff_man *man, int ln, char *buf, i |
|
Line 62 man_parseln(struct roff_man *man, int ln, char *buf, i |
|
if (man->last->type != ROFFT_EQN || ln > man->last->line) |
if (man->last->type != ROFFT_EQN || ln > man->last->line) |
man->flags |= MAN_NEWLINE; |
man->flags |= MAN_NEWLINE; |
|
|
return (roff_getcontrol(man->roff, buf, &offs) ? |
return roff_getcontrol(man->roff, buf, &offs) ? |
man_pmacro(man, ln, buf, offs) : |
man_pmacro(man, ln, buf, offs) : |
man_ptext(man, ln, buf, offs)); |
man_ptext(man, ln, buf, offs); |
} |
} |
|
|
static void |
static void |
Line 97 man_ptext(struct roff_man *man, int line, char *buf, i |
|
Line 97 man_ptext(struct roff_man *man, int line, char *buf, i |
|
if (man->flags & MAN_LITERAL) { |
if (man->flags & MAN_LITERAL) { |
roff_word_alloc(man, line, offs, buf + offs); |
roff_word_alloc(man, line, offs, buf + offs); |
man_descope(man, line, offs); |
man_descope(man, line, offs); |
return(1); |
return 1; |
} |
} |
|
|
for (i = offs; buf[i] == ' '; i++) |
for (i = offs; buf[i] == ' '; i++) |
Line 115 man_ptext(struct roff_man *man, int line, char *buf, i |
|
Line 115 man_ptext(struct roff_man *man, int line, char *buf, i |
|
roff_elem_alloc(man, line, offs, MAN_sp); |
roff_elem_alloc(man, line, offs, MAN_sp); |
man->next = ROFF_NEXT_SIBLING; |
man->next = ROFF_NEXT_SIBLING; |
} |
} |
return(1); |
return 1; |
} |
} |
|
|
/* |
/* |
Line 152 man_ptext(struct roff_man *man, int line, char *buf, i |
|
Line 152 man_ptext(struct roff_man *man, int line, char *buf, i |
|
man->last->flags |= MAN_EOS; |
man->last->flags |= MAN_EOS; |
|
|
man_descope(man, line, offs); |
man_descope(man, line, offs); |
return(1); |
return 1; |
} |
} |
|
|
static int |
static int |
Line 183 man_pmacro(struct roff_man *man, int ln, char *buf, in |
|
Line 183 man_pmacro(struct roff_man *man, int ln, char *buf, in |
|
if (tok == TOKEN_NONE) { |
if (tok == TOKEN_NONE) { |
mandoc_msg(MANDOCERR_MACRO, man->parse, |
mandoc_msg(MANDOCERR_MACRO, man->parse, |
ln, ppos, buf + ppos - 1); |
ln, ppos, buf + ppos - 1); |
return(1); |
return 1; |
} |
} |
|
|
/* Skip a leading escape sequence or tab. */ |
/* Skip a leading escape sequence or tab. */ |
Line 234 man_pmacro(struct roff_man *man, int ln, char *buf, in |
|
Line 234 man_pmacro(struct roff_man *man, int ln, char *buf, in |
|
n = man->last; |
n = man->last; |
if (n->type == ROFFT_BODY && |
if (n->type == ROFFT_BODY && |
strcmp(n->prev->child->string, "NAME")) |
strcmp(n->prev->child->string, "NAME")) |
return(2); |
return 2; |
} |
} |
|
|
/* |
/* |
Line 245 man_pmacro(struct roff_man *man, int ln, char *buf, in |
|
Line 245 man_pmacro(struct roff_man *man, int ln, char *buf, in |
|
|
|
if ( ! bline || man->flags & MAN_ELINE || |
if ( ! bline || man->flags & MAN_ELINE || |
man_macros[tok].flags & MAN_NSCOPED) |
man_macros[tok].flags & MAN_NSCOPED) |
return(1); |
return 1; |
|
|
assert(man->flags & MAN_BLINE); |
assert(man->flags & MAN_BLINE); |
man->flags &= ~MAN_BLINE; |
man->flags &= ~MAN_BLINE; |
|
|
man_unscope(man, man->last->parent); |
man_unscope(man, man->last->parent); |
roff_body_alloc(man, ln, ppos, man->last->tok); |
roff_body_alloc(man, ln, ppos, man->last->tok); |
return(1); |
return 1; |
} |
} |
|
|
void |
void |
Line 283 man_breakscope(struct roff_man *man, int tok) |
|
Line 283 man_breakscope(struct roff_man *man, int tok) |
|
} |
} |
|
|
/* |
/* |
|
* Weird special case: |
|
* Switching fill mode closes section headers. |
|
*/ |
|
|
|
if (man->flags & MAN_BLINE && |
|
(tok == MAN_nf || tok == MAN_fi) && |
|
(man->last->tok == MAN_SH || man->last->tok == MAN_SS)) { |
|
n = man->last; |
|
man_unscope(man, n); |
|
roff_body_alloc(man, n->line, n->pos, n->tok); |
|
man->flags &= ~MAN_BLINE; |
|
} |
|
|
|
/* |
* A block header next line scope is open, |
* A block header next line scope is open, |
* and the new macro is not allowed inside block headers. |
* and the new macro is not allowed inside block headers. |
* Delete the block that is being broken. |
* Delete the block that is being broken. |
Line 316 man_mparse(const struct roff_man *man) |
|
Line 330 man_mparse(const struct roff_man *man) |
|
{ |
{ |
|
|
assert(man && man->parse); |
assert(man && man->parse); |
return(man->parse); |
return man->parse; |
|
} |
|
|
|
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 & MAN_VALID)) |
|
mandoc_msg(MANDOCERR_NF_SKIP, man->parse, |
|
n->line, n->pos, "nf"); |
|
man->flags |= MAN_LITERAL; |
|
break; |
|
case MAN_fi: |
|
case MAN_EE: |
|
if ( ! (man->flags & MAN_LITERAL) && |
|
! (n->flags & MAN_VALID)) |
|
mandoc_msg(MANDOCERR_FI_SKIP, man->parse, |
|
n->line, n->pos, "fi"); |
|
man->flags &= ~MAN_LITERAL; |
|
break; |
|
default: |
|
break; |
|
} |
|
man->last->flags |= MAN_VALID; |
|
} |
|
|
|
void |
|
man_validate(struct roff_man *man) |
|
{ |
|
|
|
man->last = man->first; |
|
man_node_validate(man); |
|
man->flags &= ~MAN_LITERAL; |
} |
} |