===================================================================
RCS file: /cvs/mandoc/main.c,v
retrieving revision 1.273.2.5
retrieving revision 1.273.2.6
diff -u -p -r1.273.2.5 -r1.273.2.6
--- mandoc/main.c	2017/01/27 14:41:40	1.273.2.5
+++ mandoc/main.c	2017/02/10 15:57:47	1.273.2.6
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.273.2.5 2017/01/27 14:41:40 schwarze Exp $ */
+/*	$Id: main.c,v 1.273.2.6 2017/02/10 15:57:47 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2012, 2014-2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -763,7 +763,8 @@ parse(struct curparse *curp, int fd, const char *file)
 	if (man == NULL)
 		return;
 	if (man->macroset == MACROSET_MDOC) {
-		mdoc_validate(man);
+		if (curp->outtype != OUTT_TREE || !curp->outopts->noval)
+			mdoc_validate(man);
 		switch (curp->outtype) {
 		case OUTT_HTML:
 			html_mdoc(curp->outdata, man);
@@ -786,7 +787,8 @@ parse(struct curparse *curp, int fd, const char *file)
 		}
 	}
 	if (man->macroset == MACROSET_MAN) {
-		man_validate(man);
+		if (curp->outtype != OUTT_TREE || !curp->outopts->noval)
+			man_validate(man);
 		switch (curp->outtype) {
 		case OUTT_HTML:
 			html_man(curp->outdata, man);