===================================================================
RCS file: /cvs/mandoc/demandoc.c,v
retrieving revision 1.17
retrieving revision 1.21
diff -u -p -r1.17 -r1.21
--- mandoc/demandoc.c	2015/04/02 22:48:17	1.17
+++ mandoc/demandoc.c	2015/10/06 18:32:19	1.21
@@ -1,4 +1,4 @@
-/*	$Id: demandoc.c,v 1.17 2015/04/02 22:48:17 schwarze Exp $ */
+/*	$Id: demandoc.c,v 1.21 2015/10/06 18:32:19 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -73,7 +73,7 @@ main(int argc, char *argv[])
 			break;
 		default:
 			usage();
-			return((int)MANDOCLEVEL_BADARG);
+			return (int)MANDOCLEVEL_BADARG;
 		}
 
 	argc -= optind;
@@ -97,7 +97,7 @@ main(int argc, char *argv[])
 
 	mparse_free(mp);
 	mchars_free(mchars);
-	return((int)MANDOCLEVEL_OK);
+	return (int)MANDOCLEVEL_OK;
 }
 
 static void
@@ -110,21 +110,20 @@ usage(void)
 static void
 pmandoc(struct mparse *mp, int fd, const char *fn, int list)
 {
-	struct mdoc	*mdoc;
-	struct man	*man;
+	struct roff_man	*man;
 	int		 line, col;
 
 	mparse_readfd(mp, fd, fn);
-	mparse_result(mp, &mdoc, &man, NULL);
+	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)
+		pmdoc(man->first->child, &line, &col, list);
+	else
+		pman(man->first->child, &line, &col, list);
 
 	if ( ! list)
 		putchar('\n');