===================================================================
RCS file: /cvs/mandoc/demandoc.c,v
retrieving revision 1.28
retrieving revision 1.34
diff -u -p -r1.28 -r1.34
--- mandoc/demandoc.c	2017/01/10 13:47:00	1.28
+++ mandoc/demandoc.c	2022/04/14 16:43:43	1.34
@@ -1,4 +1,4 @@
-/*	$Id: demandoc.c,v 1.28 2017/01/10 13:47:00 schwarze Exp $ */
+/* $Id: demandoc.c,v 1.34 2022/04/14 16:43:43 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -25,10 +25,15 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "mandoc.h"
+#if DEBUG_MEMORY
+#define DEBUG_NODEF
+#include "mandoc_dbg.h"
+#endif
 #include "roff.h"
 #include "man.h"
 #include "mdoc.h"
-#include "mandoc.h"
+#include "mandoc_parse.h"
 
 static	void	 pline(int, int *, int *, int);
 static	void	 pman(const struct roff_node *, int *, int *, int);
@@ -46,6 +51,10 @@ main(int argc, char *argv[])
 	int		 ch, fd, i, list;
 	extern int	 optind;
 
+#if DEBUG_MEMORY
+	mandoc_dbg_init(argc, argv);
+#endif
+
 	if (argc < 1)
 		progname = "demandoc";
 	else if ((progname = strrchr(argv[0], '/')) == NULL)
@@ -78,7 +87,8 @@ main(int argc, char *argv[])
 	argv += optind;
 
 	mchars_alloc();
-	mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_BADARG, NULL, NULL);
+	mp = mparse_alloc(MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1 |
+	    MPARSE_VALIDATE, MANDOC_OS_OTHER, NULL);
 	assert(mp);
 
 	if (argc < 1)
@@ -95,6 +105,9 @@ main(int argc, char *argv[])
 
 	mparse_free(mp);
 	mchars_free();
+#if DEBUG_MEMORY
+	mandoc_dbg_finish();
+#endif
 	return (int)MANDOCLEVEL_OK;
 }
 
@@ -108,24 +121,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');