===================================================================
RCS file: /cvs/mandoc/Attic/validate.c,v
retrieving revision 1.21
retrieving revision 1.23
diff -u -p -r1.21 -r1.23
--- mandoc/Attic/validate.c	2009/01/09 14:45:44	1.21
+++ mandoc/Attic/validate.c	2009/01/09 15:15:31	1.23
@@ -1,4 +1,4 @@
-/* $Id: validate.c,v 1.21 2009/01/09 14:45:44 kristaps Exp $ */
+/* $Id: validate.c,v 1.23 2009/01/09 15:15:31 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -32,17 +32,22 @@ struct	valids {
 };
 
 
+static	int	pre_display(struct mdoc *, struct mdoc_node *);
 static	int	pre_prologue(struct mdoc *, struct mdoc_node *);
 static	int	pre_prologue(struct mdoc *, struct mdoc_node *);
 static	int	pre_prologue(struct mdoc *, struct mdoc_node *);
 static	int	post_headchild_err_ge1(struct mdoc *);
 static	int	post_elemchild_err_ge1(struct mdoc *);
+static	int	post_elemchild_warn_eq0(struct mdoc *);
 static	int	post_bodychild_warn_ge1(struct mdoc *);
 static	int	post_sh(struct mdoc *);
 
 static	v_post	posts_sh[] = { post_headchild_err_ge1, 
 			post_bodychild_warn_ge1, post_sh, NULL };
+static	v_post	posts_ss[] = { post_headchild_err_ge1, NULL };
+static	v_post	posts_pp[] = { post_elemchild_warn_eq0, NULL };
 static	v_post	posts_dd[] = { post_elemchild_err_ge1, NULL };
+static	v_post	posts_display[] = { post_headchild_err_ge1, NULL };
 
 
 const	struct valids mdoc_valids[MDOC_MAX] = {
@@ -51,11 +56,11 @@ const	struct valids mdoc_valids[MDOC_MAX] = {
 	{ pre_prologue, NULL }, /* Dt */
 	{ pre_prologue, NULL }, /* Os */
 	{ NULL, posts_sh }, /* Sh */ /* FIXME: preceding Pp. */
-	{ NULL, NULL }, /* Ss */ /* FIXME: preceding Pp. */
-	{ NULL, NULL }, /* Pp */ 
-	{ NULL, NULL }, /* D1 */
-	{ NULL, NULL }, /* Dl */
-	{ NULL, NULL }, /* Bd */ /* FIXME: preceding Pp. */
+	{ NULL, posts_ss }, /* Ss */ /* FIXME: preceding Pp. */
+	{ NULL, posts_pp }, /* Pp */ /* FIXME: proceeding... */
+	{ pre_display, posts_display }, /* D1 */
+	{ pre_display, posts_display }, /* Dl */
+	{ pre_display, NULL }, /* Bd */ /* FIXME: preceding Pp. */
 	{ NULL, NULL }, /* Ed */
 	{ NULL, NULL }, /* Bl */ /* FIXME: preceding Pp. */
 	{ NULL, NULL }, /* El */
@@ -169,6 +174,17 @@ post_bodychild_warn_ge1(struct mdoc *mdoc)
 
 
 static int
+post_elemchild_warn_eq0(struct mdoc *mdoc)
+{
+
+	assert(MDOC_ELEM == mdoc->last->type);
+	if (NULL == mdoc->last->child)
+		return(1);
+	return(mdoc_warn(mdoc, WARN_ARGS_EQ0));
+}
+
+
+static int
 post_elemchild_err_ge1(struct mdoc *mdoc)
 {
 
@@ -188,6 +204,21 @@ post_headchild_err_ge1(struct mdoc *mdoc)
 	if (mdoc->last->child)
 		return(1);
 	return(mdoc_err(mdoc, ERR_ARGS_GE1));
+}
+
+
+static int
+pre_display(struct mdoc *mdoc, struct mdoc_node *node)
+{
+	struct mdoc_node *n;
+
+	for (n = mdoc->last; n; n = n->parent) 
+		if (MDOC_BLOCK == n->type)
+			if (MDOC_Bd == n->data.block.tok)
+				break;
+	if (NULL == n)
+		return(1);
+	return(mdoc_verr(mdoc, node, ERR_SCOPE_NONEST));
 }