===================================================================
RCS file: /cvs/mandoc/man_validate.c,v
retrieving revision 1.128
retrieving revision 1.134
diff -u -p -r1.128 -r1.134
--- mandoc/man_validate.c	2017/06/11 19:37:01	1.128
+++ mandoc/man_validate.c	2018/04/11 17:11:13	1.134
@@ -1,7 +1,7 @@
-/*	$OpenBSD: man_validate.c,v 1.128 2017/06/11 19:37:01 schwarze Exp $ */
+/*	$OpenBSD: man_validate.c,v 1.134 2018/04/11 17:11:13 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010, 2012-2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2012-2018 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -47,11 +47,12 @@ static	void	  check_text(CHKARGS);
 
 static	void	  post_AT(CHKARGS);
 static	void	  post_IP(CHKARGS);
-static	void	  post_vs(CHKARGS);
 static	void	  post_OP(CHKARGS);
 static	void	  post_TH(CHKARGS);
 static	void	  post_UC(CHKARGS);
 static	void	  post_UR(CHKARGS);
+static	void	  post_in(CHKARGS);
+static	void	  post_vs(CHKARGS);
 
 static	const v_check __man_valids[MAN_MAX - MAN_TH] = {
 	post_TH,    /* TH */
@@ -82,12 +83,14 @@ static	const v_check __man_valids[MAN_MAX - MAN_TH] = 
 	post_UC,    /* UC */
 	NULL,       /* PD */
 	post_AT,    /* AT */
-	NULL,       /* in */
+	post_in,    /* in */
 	post_OP,    /* OP */
 	NULL,       /* EX */
 	NULL,       /* EE */
 	post_UR,    /* UR */
 	NULL,       /* UE */
+	post_UR,    /* MT */
+	NULL,       /* ME */
 };
 static	const v_check *man_valids = __man_valids - MAN_TH;
 
@@ -117,6 +120,7 @@ man_node_validate(struct roff_man *man)
 	case ROFFT_ROOT:
 		check_root(man, n);
 		break;
+	case ROFFT_COMMENT:
 	case ROFFT_EQN:
 	case ROFFT_TBL:
 		break;
@@ -146,10 +150,9 @@ man_node_validate(struct roff_man *man)
 static void
 check_root(CHKARGS)
 {
-
 	assert((man->flags & (MAN_BLINE | MAN_ELINE)) == 0);
 
-	if (NULL == man->first->child)
+	if (n->last == NULL || n->last->type == ROFFT_COMMENT)
 		mandoc_msg(MANDOCERR_DOC_EMPTY, man->parse,
 		    n->line, n->pos, NULL);
 	else
@@ -169,6 +172,12 @@ check_root(CHKARGS)
 		man->meta.date = man->quick ? mandoc_strdup("") :
 		    mandoc_normdate(man, NULL, n->line, n->pos);
 	}
+
+	if (man->meta.os_e &&
+	    (man->meta.rcsids & (1 << man->meta.os_e)) == 0)
+		mandoc_msg(MANDOCERR_RCS_MISSING, man->parse, 0, 0,
+		    man->meta.os_e == MANDOC_OS_OPENBSD ?
+		    "(OpenBSD)" : "(NetBSD)");
 }
 
 static void
@@ -202,10 +211,9 @@ post_OP(CHKARGS)
 static void
 post_UR(CHKARGS)
 {
-
 	if (n->type == ROFFT_HEAD && n->child == NULL)
-		mandoc_vmsg(MANDOCERR_UR_NOHEAD, man->parse,
-		    n->line, n->pos, "UR");
+		mandoc_msg(MANDOCERR_UR_NOHEAD, man->parse,
+		    n->line, n->pos, roff_name[n->tok]);
 	check_part(man, n);
 }
 
@@ -335,8 +343,14 @@ post_TH(CHKARGS)
 
 	if (n && (n = n->next))
 		man->meta.os = mandoc_strdup(n->string);
-	else if (man->defos != NULL)
-		man->meta.os = mandoc_strdup(man->defos);
+	else if (man->os_s != NULL)
+		man->meta.os = mandoc_strdup(man->os_s);
+	if (man->meta.os_e == MANDOC_OS_OTHER && man->meta.os != NULL) {
+		if (strstr(man->meta.os, "OpenBSD") != NULL)
+			man->meta.os_e = MANDOC_OS_OPENBSD;
+		else if (strstr(man->meta.os, "NetBSD") != NULL)
+			man->meta.os_e = MANDOC_OS_NETBSD;
+	}
 
 	/* TITLE MSEC DATE OS ->VOL<- */
 	/* If missing, use the default VOL name for MSEC. */
@@ -432,6 +446,22 @@ post_AT(CHKARGS)
 
 	free(man->meta.os);
 	man->meta.os = mandoc_strdup(p);
+}
+
+static void
+post_in(CHKARGS)
+{
+	char	*s;
+
+	if (n->parent->tok != MAN_TP ||
+	    n->parent->type != ROFFT_HEAD ||
+	    n->child == NULL ||
+	    *n->child->string == '+' ||
+	    *n->child->string == '-')
+		return;
+	mandoc_asprintf(&s, "+%s", n->child->string);
+	free(n->child->string);
+	n->child->string = s;
 }
 
 static void