merge main.c 1.281, manpath.c 1.33: -Ttree -Onoval

2 files changed, 10 insertions, 5 deletions

diff --git a/main.c b/main.c
index 4c1da8c4..8a765cc0 100644
--- a/main.c
+++ b/main.c
@@ -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);
diff --git a/manpath.c b/manpath.c
index c77946b9..ca033a5d 100644
--- a/manpath.c
+++ b/manpath.c
@@ -1,4 +1,4 @@
-/*	$Id: manpath.c,v 1.30.2.1 2017/01/27 14:41:40 schwarze Exp $	*/
+/*	$Id: manpath.c,v 1.30.2.2 2017/02/10 15:57:47 schwarze Exp $	*/
 /*
  * Copyright (c) 2011, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -277,7 +277,7 @@ manconf_output(struct manoutput *conf, const char *cp, int fromfile)
 {
 	const char *const toks[] = {
 	    "includes", "man", "paper", "style",
-	    "indent", "width", "fragment", "mdoc"
+	    "indent", "width", "fragment", "mdoc", "noval"
 	};
 
 	const char	*errstr;
@@ -361,6 +361,9 @@ manconf_output(struct manoutput *conf, const char *cp, int fromfile)
 	case 7:
 		conf->mdoc = 1;
 		return 0;
+	case 8:
+		conf->noval = 1;
+		return 0;
 	default:
 		if (fromfile)
 			warnx("-O %s: Bad argument", cp);