===================================================================
RCS file: /cvs/mandoc/demandoc.c,v
retrieving revision 1.18
retrieving revision 1.31
diff -u -p -r1.18 -r1.31
--- mandoc/demandoc.c	2015/04/18 16:06:39	1.18
+++ mandoc/demandoc.c	2018/12/14 01:18:25	1.31
@@ -1,4 +1,4 @@
-/*	$Id: demandoc.c,v 1.18 2015/04/18 16:06:39 schwarze Exp $ */
+/*	$Id: demandoc.c,v 1.31 2018/12/14 01:18:25 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -20,16 +20,16 @@
 
 #include <assert.h>
 #include <ctype.h>
-#include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+#include "mandoc.h"
 #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);
@@ -44,7 +44,6 @@ int
 main(int argc, char *argv[])
 {
 	struct mparse	*mp;
-	struct mchars	*mchars;
 	int		 ch, fd, i, list;
 	extern int	 optind;
 
@@ -73,14 +72,14 @@ main(int argc, char *argv[])
 			break;
 		default:
 			usage();
-			return((int)MANDOCLEVEL_BADARG);
+			return (int)MANDOCLEVEL_BADARG;
 		}
 
 	argc -= optind;
 	argv += optind;
 
-	mchars = mchars_alloc();
-	mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_BADARG, NULL, mchars, NULL);
+	mchars_alloc();
+	mp = mparse_alloc(MPARSE_SO, MANDOC_OS_OTHER, NULL);
 	assert(mp);
 
 	if (argc < 1)
@@ -88,7 +87,7 @@ main(int argc, char *argv[])
 
 	for (i = 0; i < argc; i++) {
 		mparse_reset(mp);
-		if (mparse_open(mp, &fd, argv[i]) != MANDOCLEVEL_OK) {
+		if ((fd = mparse_open(mp, argv[i])) == -1) {
 			perror(argv[i]);
 			continue;
 		}
@@ -96,8 +95,8 @@ main(int argc, char *argv[])
 	}
 
 	mparse_free(mp);
-	mchars_free(mchars);
-	return((int)MANDOCLEVEL_OK);
+	mchars_free();
+	return (int)MANDOCLEVEL_OK;
 }
 
 static void
@@ -110,21 +109,24 @@ usage(void)
 static void
 pmandoc(struct mparse *mp, int fd, const char *fn, int list)
 {
-	struct roff_man	*mdoc;
 	struct roff_man	*man;
 	int		 line, col;
 
 	mparse_readfd(mp, fd, fn);
-	mparse_result(mp, &mdoc, &man, NULL);
+	close(fd);
+	mparse_result(mp, &man, NULL);
 	line = 1;
 	col = 0;
 
-	if (mdoc)
-		pmdoc(mdoc_node(mdoc), &line, &col, list);
-	else if (man)
-		pman(man_node(man), &line, &col, list);
-	else
+	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 ( ! list)
 		putchar('\n');
@@ -238,7 +240,7 @@ pmdoc(const struct roff_node *p, int *line, int *col, 
 {
 
 	for ( ; p; p = p->next) {
-		if (MDOC_LINE & p->flags)
+		if (NODE_LINE & p->flags)
 			pline(p->line, line, col, list);
 		if (ROFFT_TEXT == p->type)
 			pstring(p->string, p->pos, col, list);
@@ -252,7 +254,7 @@ pman(const struct roff_node *p, int *line, int *col, i
 {
 
 	for ( ; p; p = p->next) {
-		if (MAN_LINE & p->flags)
+		if (NODE_LINE & p->flags)
 			pline(p->line, line, col, list);
 		if (ROFFT_TEXT == p->type)
 			pstring(p->string, p->pos, col, list);