===================================================================
RCS file: /cvs/mandoc/mdoc_validate.c,v
retrieving revision 1.233
retrieving revision 1.235
diff -u -p -r1.233 -r1.235
--- mandoc/mdoc_validate.c	2014/07/30 12:58:21	1.233
+++ mandoc/mdoc_validate.c	2014/07/30 17:06:26	1.235
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_validate.c,v 1.233 2014/07/30 12:58:21 schwarze Exp $ */
+/*	$Id: mdoc_validate.c,v 1.235 2014/07/30 17:06:26 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -66,7 +66,6 @@ struct	valids {
 
 static	int	 check_count(struct mdoc *, enum mdoc_type,
 			enum check_lvl, enum check_ineq, int);
-static	int	 check_parent(PRE_ARGS, enum mdoct, enum mdoc_type);
 static	void	 check_text(struct mdoc *, int, int, char *);
 static	void	 check_argv(struct mdoc *,
 			struct mdoc_node *, struct mdoc_argv *);
@@ -124,13 +123,10 @@ static	int	 pre_bl(PRE_ARGS);
 static	int	 pre_dd(PRE_ARGS);
 static	int	 pre_display(PRE_ARGS);
 static	int	 pre_dt(PRE_ARGS);
-static	int	 pre_it(PRE_ARGS);
 static	int	 pre_literal(PRE_ARGS);
 static	int	 pre_obsolete(PRE_ARGS);
 static	int	 pre_os(PRE_ARGS);
 static	int	 pre_par(PRE_ARGS);
-static	int	 pre_sh(PRE_ARGS);
-static	int	 pre_ss(PRE_ARGS);
 static	int	 pre_std(PRE_ARGS);
 
 static	v_post	 posts_an[] = { post_an, NULL };
@@ -176,12 +172,10 @@ static	v_pre	 pres_d1[] = { pre_display, NULL };
 static	v_pre	 pres_dl[] = { pre_literal, pre_display, NULL };
 static	v_pre	 pres_dd[] = { pre_dd, NULL };
 static	v_pre	 pres_dt[] = { pre_dt, NULL };
-static	v_pre	 pres_it[] = { pre_it, pre_par, NULL };
+static	v_pre	 pres_it[] = { pre_par, NULL };
 static	v_pre	 pres_obsolete[] = { pre_obsolete, NULL };
 static	v_pre	 pres_os[] = { pre_os, NULL };
 static	v_pre	 pres_pp[] = { pre_par, NULL };
-static	v_pre	 pres_sh[] = { pre_sh, NULL };
-static	v_pre	 pres_ss[] = { pre_ss, NULL };
 static	v_pre	 pres_std[] = { pre_std, NULL };
 
 static	const struct valids mdoc_valids[MDOC_MAX] = {
@@ -189,8 +183,8 @@ static	const struct valids mdoc_valids[MDOC_MAX] = {
 	{ pres_dd, posts_dd },			/* Dd */
 	{ pres_dt, posts_dt },			/* Dt */
 	{ pres_os, posts_os },			/* Os */
-	{ pres_sh, posts_sh },			/* Sh */
-	{ pres_ss, posts_ss },			/* Ss */
+	{ NULL, posts_sh },			/* Sh */
+	{ NULL, posts_ss },			/* Ss */
 	{ pres_pp, posts_pp },			/* Pp */
 	{ pres_d1, posts_d1 },			/* D1 */
 	{ pres_dl, posts_dl },			/* Dl */
@@ -550,22 +544,6 @@ check_text(struct mdoc *mdoc, int ln, int pos, char *p
 }
 
 static int
-check_parent(PRE_ARGS, enum mdoct tok, enum mdoc_type t)
-{
-
-	assert(n->parent);
-	if ((MDOC_ROOT == t || tok == n->parent->tok) &&
-			(t == n->parent->type))
-		return(1);
-
-	mandoc_vmsg(MANDOCERR_SYNTCHILD, mdoc->parse,
-	    n->line, n->pos, "want parent %s",
-	    MDOC_ROOT == t ? "<root>" : mdoc_macronames[tok]);
-	return(0);
-}
-
-
-static int
 pre_display(PRE_ARGS)
 {
 	struct mdoc_node *node;
@@ -858,34 +836,6 @@ pre_bd(PRE_ARGS)
 }
 
 static int
-pre_ss(PRE_ARGS)
-{
-
-	if (MDOC_BLOCK != n->type)
-		return(1);
-	return(check_parent(mdoc, n, MDOC_Sh, MDOC_BODY));
-}
-
-static int
-pre_sh(PRE_ARGS)
-{
-
-	if (MDOC_BLOCK != n->type)
-		return(1);
-	return(check_parent(mdoc, n, MDOC_MAX, MDOC_ROOT));
-}
-
-static int
-pre_it(PRE_ARGS)
-{
-
-	if (MDOC_BLOCK != n->type)
-		return(1);
-
-	return(check_parent(mdoc, n, MDOC_Bl, MDOC_BODY));
-}
-
-static int
 pre_an(PRE_ARGS)
 {
 	int		 i;
@@ -1683,16 +1633,24 @@ ebool(struct mdoc *mdoc)
 static int
 post_root(POST_ARGS)
 {
-	int		  ret;
 	struct mdoc_node *n;
 
-	ret = 1;
+	/* Add missing prologue data. */
 
-	/* Check that we have a finished prologue. */
-
 	if ( ! (MDOC_PBODY & mdoc->flags)) {
-		ret = 0;
-		mdoc_nmsg(mdoc, mdoc->first, MANDOCERR_NODOCPROLOG);
+		mandoc_msg(MANDOCERR_PROLOG_BAD, mdoc->parse, 0, 0, "EOF");
+		if (mdoc->meta.date == NULL)
+			mdoc->meta.date = mdoc->quick ?
+			    mandoc_strdup("") :
+			    mandoc_normdate(mdoc->parse, NULL, 0, 0);
+		if (mdoc->meta.title == NULL)
+			mdoc->meta.title = mandoc_strdup("UNKNOWN");
+		if (mdoc->meta.vol == NULL)
+			mdoc->meta.vol = mandoc_strdup("LOCAL");
+		if (mdoc->meta.arch == NULL)
+			mdoc->meta.msec = mandoc_strdup("1");
+		if (mdoc->meta.os == NULL)
+			mdoc->meta.os = mandoc_strdup("UNKNOWN");
 	}
 
 	n = mdoc->first;
@@ -1707,7 +1665,7 @@ post_root(POST_ARGS)
 		    n->child->line, n->child->pos,
 		    mdoc_macronames[n->child->tok]);
 
-	return(ret);
+	return(1);
 }
 
 static int