X-Git-Url: https://git.cameronkatri.com/mandoc.git/blobdiff_plain/92f8786f6ad5b622da1afc6b267a40001731571b..67dcc2e5b969bc3dc00fcdd852cb6fd4ed9a2107:/demandoc.c?ds=sidebyside

diff --git a/demandoc.c b/demandoc.c
index 4e775c19..57d0cc5f 100644
--- a/demandoc.c
+++ b/demandoc.c
@@ -1,4 +1,4 @@
-/*	$Id: demandoc.c,v 1.30 2018/12/13 11:55:46 schwarze Exp $ */
+/*	$Id: demandoc.c,v 1.33 2019/03/03 11:01:15 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -79,8 +79,8 @@ main(int argc, char *argv[])
 	argv += optind;
 
 	mchars_alloc();
-	mp = mparse_alloc(MPARSE_SO, MANDOCERR_MAX, NULL,
-	    MANDOC_OS_OTHER, NULL);
+	mp = mparse_alloc(MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1 |
+	    MPARSE_VALIDATE, MANDOC_OS_OTHER, NULL);
 	assert(mp);
 
 	if (argc < 1)
@@ -110,24 +110,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');