diff options
Diffstat (limited to 'demandoc.c')
| -rw-r--r-- | demandoc.c | 21 |
1 files changed, 8 insertions, 13 deletions
@@ -1,4 +1,4 @@ -/* $Id: demandoc.c,v 1.31 2018/12/14 01:18:25 schwarze Exp $ */ +/* $Id: demandoc.c,v 1.32 2018/12/30 00:49:54 schwarze Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -79,7 +79,7 @@ main(int argc, char *argv[]) argv += optind; mchars_alloc(); - mp = mparse_alloc(MPARSE_SO, MANDOC_OS_OTHER, NULL); + mp = mparse_alloc(MPARSE_SO | MPARSE_VALIDATE, MANDOC_OS_OTHER, NULL); assert(mp); if (argc < 1) @@ -109,24 +109,19 @@ usage(void) static void pmandoc(struct mparse *mp, int fd, const char *fn, int list) { - struct roff_man *man; + struct roff_meta *meta; int line, col; mparse_readfd(mp, fd, fn); close(fd); - mparse_result(mp, &man, NULL); + meta = mparse_result(mp); line = 1; col = 0; - if (man == NULL) - return; - if (man->macroset == MACROSET_MDOC) { - mdoc_validate(man); - pmdoc(man->first->child, &line, &col, list); - } else { - man_validate(man); - pman(man->first->child, &line, &col, list); - } + if (meta->macroset == MACROSET_MDOC) + pmdoc(meta->first->child, &line, &col, list); + else + pman(meta->first->child, &line, &col, list); if ( ! list) putchar('\n'); |