version 1.270, 2018/12/04 02:53:51 |
version 1.274, 2018/12/31 07:46:07 |
Line 210 mdoc_ptext(struct roff_man *mdoc, int line, char *buf, |
|
Line 210 mdoc_ptext(struct roff_man *mdoc, int line, char *buf, |
|
* Strip trailing tabs in literal context only; |
* Strip trailing tabs in literal context only; |
* outside, they affect the next line. |
* outside, they affect the next line. |
*/ |
*/ |
if (MDOC_LITERAL & mdoc->flags) |
if (mdoc->flags & ROFF_NOFILL) |
continue; |
continue; |
break; |
break; |
case '\\': |
case '\\': |
Line 227 mdoc_ptext(struct roff_man *mdoc, int line, char *buf, |
|
Line 227 mdoc_ptext(struct roff_man *mdoc, int line, char *buf, |
|
*end = '\0'; |
*end = '\0'; |
|
|
if (ws) |
if (ws) |
mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse, |
mandoc_msg(MANDOCERR_SPACE_EOL, line, (int)(ws - buf), NULL); |
line, (int)(ws-buf), NULL); |
|
|
|
/* |
/* |
* Blank lines are allowed in no-fill mode |
* Blank lines are allowed in no-fill mode |
Line 236 mdoc_ptext(struct roff_man *mdoc, int line, char *buf, |
|
Line 235 mdoc_ptext(struct roff_man *mdoc, int line, char *buf, |
|
* but add a single vertical space elsewhere. |
* but add a single vertical space elsewhere. |
*/ |
*/ |
|
|
if (buf[offs] == '\0' && ! (mdoc->flags & MDOC_LITERAL)) { |
if (buf[offs] == '\0' && (mdoc->flags & ROFF_NOFILL) == 0) { |
switch (mdoc->last->type) { |
switch (mdoc->last->type) { |
case ROFFT_TEXT: |
case ROFFT_TEXT: |
sp = mdoc->last->string; |
sp = mdoc->last->string; |
Line 252 mdoc_ptext(struct roff_man *mdoc, int line, char *buf, |
|
Line 251 mdoc_ptext(struct roff_man *mdoc, int line, char *buf, |
|
default: |
default: |
break; |
break; |
} |
} |
mandoc_msg(MANDOCERR_FI_BLANK, mdoc->parse, |
mandoc_msg(MANDOCERR_FI_BLANK, line, (int)(c - buf), NULL); |
line, (int)(c - buf), NULL); |
|
roff_elem_alloc(mdoc, line, offs, ROFF_sp); |
roff_elem_alloc(mdoc, line, offs, ROFF_sp); |
mdoc->last->flags |= NODE_VALID | NODE_ENDED; |
mdoc->last->flags |= NODE_VALID | NODE_ENDED; |
mdoc->next = ROFF_NEXT_SIBLING; |
mdoc->next = ROFF_NEXT_SIBLING; |
Line 262 mdoc_ptext(struct roff_man *mdoc, int line, char *buf, |
|
Line 260 mdoc_ptext(struct roff_man *mdoc, int line, char *buf, |
|
|
|
roff_word_alloc(mdoc, line, offs, buf+offs); |
roff_word_alloc(mdoc, line, offs, buf+offs); |
|
|
if (mdoc->flags & MDOC_LITERAL) |
if (mdoc->flags & ROFF_NOFILL) |
return 1; |
return 1; |
|
|
/* |
/* |
Line 293 mdoc_ptext(struct roff_man *mdoc, int line, char *buf, |
|
Line 291 mdoc_ptext(struct roff_man *mdoc, int line, char *buf, |
|
if (*c == ' ') |
if (*c == ' ') |
c++; |
c++; |
if (isupper((unsigned char)(*c))) |
if (isupper((unsigned char)(*c))) |
mandoc_msg(MANDOCERR_EOS, mdoc->parse, |
mandoc_msg(MANDOCERR_EOS, line, (int)(c - buf), NULL); |
line, (int)(c - buf), NULL); |
|
} |
} |
|
|
return 1; |
return 1; |
Line 322 mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, |
|
Line 319 mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, |
|
if (sz == 2 || sz == 3) |
if (sz == 2 || sz == 3) |
tok = roffhash_find(mdoc->mdocmac, buf + sv, sz); |
tok = roffhash_find(mdoc->mdocmac, buf + sv, sz); |
if (tok == TOKEN_NONE) { |
if (tok == TOKEN_NONE) { |
mandoc_msg(MANDOCERR_MACRO, mdoc->parse, |
mandoc_msg(MANDOCERR_MACRO, ln, sv, "%s", buf + sv - 1); |
ln, sv, buf + sv - 1); |
|
return 1; |
return 1; |
} |
} |
|
|
Line 353 mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, |
|
Line 349 mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, |
|
*/ |
*/ |
|
|
if ('\0' == buf[offs] && ' ' == buf[offs - 1]) |
if ('\0' == buf[offs] && ' ' == buf[offs - 1]) |
mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse, |
mandoc_msg(MANDOCERR_SPACE_EOL, ln, offs - 1, NULL); |
ln, offs - 1, NULL); |
|
|
|
/* |
/* |
* If an initial macro or a list invocation, divert directly |
* If an initial macro or a list invocation, divert directly |
Line 432 mdoc_isdelim(const char *p) |
|
Line 427 mdoc_isdelim(const char *p) |
|
return DELIM_MIDDLE; |
return DELIM_MIDDLE; |
|
|
return DELIM_NONE; |
return DELIM_NONE; |
} |
|
|
|
void |
|
mdoc_validate(struct roff_man *mdoc) |
|
{ |
|
|
|
mdoc->last = mdoc->first; |
|
mdoc_node_validate(mdoc); |
|
mdoc_state_reset(mdoc); |
|
} |
} |