version 1.149, 2016/07/10 13:34:30 |
version 1.150.2.2, 2016/11/10 12:52:12 |
Line 143 static const char * const mandocerrs[MANDOCERR_MAX] = |
|
Line 143 static const char * const mandocerrs[MANDOCERR_MAX] = |
|
"empty argument, using 0n", |
"empty argument, using 0n", |
"missing display type, using -ragged", |
"missing display type, using -ragged", |
"list type is not the first argument", |
"list type is not the first argument", |
"missing -width in -tag list, using 8n", |
"missing -width in -tag list, using 6n", |
"missing utility name, using \"\"", |
"missing utility name, using \"\"", |
"missing function name, using \"\"", |
"missing function name, using \"\"", |
"empty head in list item", |
"empty head in list item", |
Line 291 choose_parser(struct mparse *curp) |
|
Line 291 choose_parser(struct mparse *curp) |
|
} |
} |
} |
} |
|
|
if (curp->man == NULL) { |
|
curp->man = roff_man_alloc(curp->roff, curp, curp->defos, |
|
curp->options & MPARSE_QUICK ? 1 : 0); |
|
curp->man->macroset = MACROSET_MAN; |
|
curp->man->first->tok = TOKEN_NONE; |
|
} |
|
|
|
if (format == MPARSE_MDOC) { |
if (format == MPARSE_MDOC) { |
mdoc_hash_init(); |
mdoc_hash_init(); |
curp->man->macroset = MACROSET_MDOC; |
curp->man->macroset = MACROSET_MDOC; |
Line 432 mparse_buf_r(struct mparse *curp, struct buf blk, size |
|
Line 425 mparse_buf_r(struct mparse *curp, struct buf blk, size |
|
i += 2; |
i += 2; |
/* Comment, skip to end of line */ |
/* Comment, skip to end of line */ |
for (; i < blk.sz; ++i) { |
for (; i < blk.sz; ++i) { |
if ('\n' == blk.buf[i]) { |
if (blk.buf[i] != '\n') |
++i; |
continue; |
++lnn; |
if (blk.buf[i - 1] == ' ' || |
break; |
blk.buf[i - 1] == '\t') |
} |
mandoc_msg( |
|
MANDOCERR_SPACE_EOL, |
|
curp, curp->line, |
|
pos, NULL); |
|
++i; |
|
++lnn; |
|
break; |
} |
} |
|
|
/* Backout trailing whitespaces */ |
/* Backout trailing whitespaces */ |
|
|
break; |
break; |
} |
} |
|
|
/* |
if (curp->man->macroset == MACROSET_NONE) |
* If input parsers have not been allocated, do so now. |
|
* We keep these instanced between parsers, but set them |
|
* locally per parse routine since we can use different |
|
* parsers with each one. |
|
*/ |
|
|
|
if (curp->man == NULL || |
|
curp->man->macroset == MACROSET_NONE) |
|
choose_parser(curp); |
choose_parser(curp); |
|
|
/* |
/* |
Line 683 read_whole_file(struct mparse *curp, const char *file, |
|
Line 674 read_whole_file(struct mparse *curp, const char *file, |
|
static void |
static void |
mparse_end(struct mparse *curp) |
mparse_end(struct mparse *curp) |
{ |
{ |
|
|
if (curp->man == NULL && curp->sodest == NULL) |
|
curp->man = roff_man_alloc(curp->roff, curp, curp->defos, |
|
curp->options & MPARSE_QUICK ? 1 : 0); |
|
if (curp->man->macroset == MACROSET_NONE) |
if (curp->man->macroset == MACROSET_NONE) |
curp->man->macroset = MACROSET_MAN; |
curp->man->macroset = MACROSET_MAN; |
if (curp->man->macroset == MACROSET_MDOC) |
if (curp->man->macroset == MACROSET_MDOC) |
Line 842 mparse_alloc(int options, enum mandoclevel wlevel, man |
|
Line 829 mparse_alloc(int options, enum mandoclevel wlevel, man |
|
void |
void |
mparse_reset(struct mparse *curp) |
mparse_reset(struct mparse *curp) |
{ |
{ |
|
|
roff_reset(curp->roff); |
roff_reset(curp->roff); |
|
roff_man_reset(curp->man); |
if (curp->man != NULL) |
|
roff_man_reset(curp->man); |
|
if (curp->secondary) |
if (curp->secondary) |
curp->secondary->sz = 0; |
curp->secondary->sz = 0; |
|
|