version 1.314, 2018/12/20 21:30:32 |
version 1.315, 2018/12/30 00:49:55 |
Line 308 main(int argc, char *argv[]) |
|
Line 308 main(int argc, char *argv[]) |
|
} |
} |
} |
} |
|
|
|
if (curp.outtype != OUTT_TREE || !curp.outopts->noval) |
|
options |= MPARSE_VALIDATE; |
|
|
if (outmode == OUTMODE_FLN || |
if (outmode == OUTMODE_FLN || |
outmode == OUTMODE_LST || |
outmode == OUTMODE_LST || |
!isatty(STDOUT_FILENO)) |
!isatty(STDOUT_FILENO)) |
Line 801 fs_search(const struct mansearch *cfg, const struct ma |
|
Line 804 fs_search(const struct mansearch *cfg, const struct ma |
|
static void |
static void |
parse(struct curparse *curp, int fd, const char *file) |
parse(struct curparse *curp, int fd, const char *file) |
{ |
{ |
struct roff_man *man; |
struct roff_meta *meta; |
|
|
/* Begin by parsing the file itself. */ |
/* Begin by parsing the file itself. */ |
|
|
Line 823 parse(struct curparse *curp, int fd, const char *file) |
|
Line 826 parse(struct curparse *curp, int fd, const char *file) |
|
if (curp->outdata == NULL) |
if (curp->outdata == NULL) |
outdata_alloc(curp); |
outdata_alloc(curp); |
|
|
mparse_result(curp->mp, &man, NULL); |
mandoc_xr_reset(); |
|
meta = mparse_result(curp->mp); |
|
|
/* Execute the out device, if it exists. */ |
/* Execute the out device, if it exists. */ |
|
|
if (man == NULL) |
if (meta->macroset == MACROSET_MDOC) { |
return; |
|
mandoc_xr_reset(); |
|
if (man->macroset == MACROSET_MDOC) { |
|
if (curp->outtype != OUTT_TREE || !curp->outopts->noval) |
|
mdoc_validate(man); |
|
switch (curp->outtype) { |
switch (curp->outtype) { |
case OUTT_HTML: |
case OUTT_HTML: |
html_mdoc(curp->outdata, man); |
html_mdoc(curp->outdata, meta); |
break; |
break; |
case OUTT_TREE: |
case OUTT_TREE: |
tree_mdoc(curp->outdata, man); |
tree_mdoc(curp->outdata, meta); |
break; |
break; |
case OUTT_MAN: |
case OUTT_MAN: |
man_mdoc(curp->outdata, man); |
man_mdoc(curp->outdata, meta); |
break; |
break; |
case OUTT_PDF: |
case OUTT_PDF: |
case OUTT_ASCII: |
case OUTT_ASCII: |
case OUTT_UTF8: |
case OUTT_UTF8: |
case OUTT_LOCALE: |
case OUTT_LOCALE: |
case OUTT_PS: |
case OUTT_PS: |
terminal_mdoc(curp->outdata, man); |
terminal_mdoc(curp->outdata, meta); |
break; |
break; |
case OUTT_MARKDOWN: |
case OUTT_MARKDOWN: |
markdown_mdoc(curp->outdata, man); |
markdown_mdoc(curp->outdata, meta); |
break; |
break; |
default: |
default: |
break; |
break; |
} |
} |
} |
} |
if (man->macroset == MACROSET_MAN) { |
if (meta->macroset == MACROSET_MAN) { |
if (curp->outtype != OUTT_TREE || !curp->outopts->noval) |
|
man_validate(man); |
|
switch (curp->outtype) { |
switch (curp->outtype) { |
case OUTT_HTML: |
case OUTT_HTML: |
html_man(curp->outdata, man); |
html_man(curp->outdata, meta); |
break; |
break; |
case OUTT_TREE: |
case OUTT_TREE: |
tree_man(curp->outdata, man); |
tree_man(curp->outdata, meta); |
break; |
break; |
case OUTT_MAN: |
case OUTT_MAN: |
mparse_copy(curp->mp); |
mparse_copy(curp->mp); |
Line 875 parse(struct curparse *curp, int fd, const char *file) |
|
Line 872 parse(struct curparse *curp, int fd, const char *file) |
|
case OUTT_UTF8: |
case OUTT_UTF8: |
case OUTT_LOCALE: |
case OUTT_LOCALE: |
case OUTT_PS: |
case OUTT_PS: |
terminal_man(curp->outdata, man); |
terminal_man(curp->outdata, meta); |
break; |
break; |
default: |
default: |
break; |
break; |