version 1.129, 2010/05/12 17:08:03 |
version 1.131, 2010/05/14 17:31:25 |
Line 68 const char *const __mdoc_merrnames[MERRMAX] = { |
|
Line 68 const char *const __mdoc_merrnames[MERRMAX] = { |
|
"line arguments discouraged", /* ENOLINE */ |
"line arguments discouraged", /* ENOLINE */ |
"prologue macro out of conventional order", /* EPROLOOO */ |
"prologue macro out of conventional order", /* EPROLOOO */ |
"prologue macro repeated", /* EPROLREP */ |
"prologue macro repeated", /* EPROLREP */ |
"invalid manual section", /* EBADMSEC */ |
|
"invalid section", /* EBADSEC */ |
"invalid section", /* EBADSEC */ |
"invalid font mode", /* EFONT */ |
"invalid font mode", /* EFONT */ |
"invalid date syntax", /* EBADDATE */ |
"invalid date syntax", /* EBADDATE */ |
Line 289 mdoc_parseln(struct mdoc *m, int ln, char *buf) |
|
Line 288 mdoc_parseln(struct mdoc *m, int ln, char *buf) |
|
if (MDOC_HALT & m->flags) |
if (MDOC_HALT & m->flags) |
return(0); |
return(0); |
|
|
return('.' == *buf ? mdoc_pmacro(m, ln, buf) : |
m->flags |= MDOC_NEWLINE; |
|
return('.' == *buf ? |
|
mdoc_pmacro(m, ln, buf) : |
mdoc_ptext(m, ln, buf)); |
mdoc_ptext(m, ln, buf)); |
} |
} |
|
|
Line 453 node_alloc(struct mdoc *m, int line, int pos, |
|
Line 454 node_alloc(struct mdoc *m, int line, int pos, |
|
p->pos = pos; |
p->pos = pos; |
p->tok = tok; |
p->tok = tok; |
p->type = type; |
p->type = type; |
|
if (MDOC_NEWLINE & m->flags) |
|
p->flags |= MDOC_LINE; |
|
m->flags &= ~MDOC_NEWLINE; |
return(p); |
return(p); |
} |
} |
|
|
|
|
mdoc_pmacro(struct mdoc *m, int ln, char *buf) |
mdoc_pmacro(struct mdoc *m, int ln, char *buf) |
{ |
{ |
enum mdoct tok; |
enum mdoct tok; |
int i, j; |
int i, j, sv; |
char mac[5]; |
char mac[5]; |
|
|
/* Empty lines are ignored. */ |
/* Empty lines are ignored. */ |
Line 746 mdoc_pmacro(struct mdoc *m, int ln, char *buf) |
|
Line 749 mdoc_pmacro(struct mdoc *m, int ln, char *buf) |
|
return(1); |
return(1); |
} |
} |
|
|
|
sv = i; |
|
|
/* Copy the first word into a nil-terminated buffer. */ |
/* Copy the first word into a nil-terminated buffer. */ |
|
|
for (j = 0; j < 4; j++, i++) { |
for (j = 0; j < 4; j++, i++) { |
Line 793 mdoc_pmacro(struct mdoc *m, int ln, char *buf) |
|
Line 798 mdoc_pmacro(struct mdoc *m, int ln, char *buf) |
|
* Begin recursive parse sequence. Since we're at the start of |
* Begin recursive parse sequence. Since we're at the start of |
* the line, we don't need to do callable/parseable checks. |
* the line, we don't need to do callable/parseable checks. |
*/ |
*/ |
if ( ! mdoc_macro(m, tok, ln, 1, &i, buf)) |
if ( ! mdoc_macro(m, tok, ln, sv, &i, buf)) |
goto err; |
goto err; |
|
|
return(1); |
return(1); |