===================================================================
RCS file: /cvs/mandoc/manpath.c,v
retrieving revision 1.33
retrieving revision 1.36
diff -u -p -r1.33 -r1.36
--- mandoc/manpath.c	2017/02/10 15:45:28	1.33
+++ mandoc/manpath.c	2018/10/02 14:56:47	1.36
@@ -1,6 +1,6 @@
-/*	$Id: manpath.c,v 1.33 2017/02/10 15:45:28 schwarze Exp $	*/
+/*	$Id: manpath.c,v 1.36 2018/10/02 14:56:47 schwarze Exp $ */
 /*
- * Copyright (c) 2011, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -91,6 +91,13 @@ manconf_parse(struct manconf *conf, const char *file,
 	manpath_parseline(&conf->manpath, defp, 0);
 }
 
+void
+manpath_base(struct manpaths *dirs)
+{
+	char path_base[] = MANPATH_BASE;
+	manpath_parseline(dirs, path_base, 0);
+}
+
 /*
  * Parse a FULL pathname from a colon-separated list of arrays.
  */
@@ -226,7 +233,7 @@ manconf_output(struct manoutput *conf, const char *cp,
 {
 	const char *const toks[] = {
 	    "includes", "man", "paper", "style",
-	    "indent", "width", "fragment", "mdoc", "noval"
+	    "indent", "width", "fragment", "mdoc", "noval", "toc"
 	};
 
 	const char	*errstr;
@@ -299,7 +306,7 @@ manconf_output(struct manoutput *conf, const char *cp,
 			mandoc_asprintf(&oldval, "%zu", conf->width);
 			break;
 		}
-		conf->width = strtonum(cp, 58, 1000, &errstr);
+		conf->width = strtonum(cp, 1, 1000, &errstr);
 		if (errstr == NULL)
 			return 0;
 		warnx("-O width=%s is %s", cp, errstr);
@@ -312,6 +319,9 @@ manconf_output(struct manoutput *conf, const char *cp,
 		return 0;
 	case 8:
 		conf->noval = 1;
+		return 0;
+	case 9:
+		conf->toc = 1;
 		return 0;
 	default:
 		if (fromfile)