===================================================================
RCS file: /cvs/mandoc/man_validate.c,v
retrieving revision 1.28
retrieving revision 1.34
diff -u -p -r1.28 -r1.34
--- mandoc/man_validate.c	2010/01/01 17:14:28	1.28
+++ mandoc/man_validate.c	2010/04/03 14:12:48	1.34
@@ -1,4 +1,4 @@
-/*	$Id: man_validate.c,v 1.28 2010/01/01 17:14:28 kristaps Exp $ */
+/*	$Id: man_validate.c,v 1.34 2010/04/03 14:12:48 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -46,21 +46,24 @@ static	int	  check_ge2(CHKARGS);
 static	int	  check_le5(CHKARGS);
 static	int	  check_par(CHKARGS);
 static	int	  check_part(CHKARGS);
+static	int	  check_roff(CHKARGS);
 static	int	  check_root(CHKARGS);
 static	int	  check_sec(CHKARGS);
 static	int	  check_text(CHKARGS);
+static	int	  check_title(CHKARGS);
 
 static	v_check	  posts_eq0[] = { check_eq0, NULL };
-static	v_check	  posts_ge2_le5[] = { check_ge2, check_le5, NULL };
+static	v_check	  posts_th[] = { check_ge2, check_le5, check_title, NULL };
 static	v_check	  posts_par[] = { check_par, NULL };
 static	v_check	  posts_part[] = { check_part, NULL };
 static	v_check	  posts_sec[] = { check_sec, NULL };
-static	v_check	  posts_sp[] = { check_le1, NULL };
+static	v_check	  posts_le1[] = { check_le1, NULL };
 static	v_check	  pres_bline[] = { check_bline, NULL };
+static	v_check	  pres_roff[] = { check_roff, NULL };
 
 static	const struct man_valid man_valids[MAN_MAX] = {
-	{ pres_bline, posts_eq0 }, /* br */
-	{ pres_bline, posts_ge2_le5 }, /* TH */ /* FIXME: make sure capitalised. */
+	{ NULL, posts_eq0 }, /* br */
+	{ pres_bline, posts_th }, /* TH */
 	{ pres_bline, posts_sec }, /* SH */
 	{ pres_bline, posts_sec }, /* SS */
 	{ pres_bline, posts_par }, /* TP */
@@ -80,9 +83,9 @@ static	const struct man_valid man_valids[MAN_MAX] = {
 	{ NULL, NULL }, /* I */
 	{ NULL, NULL }, /* IR */
 	{ NULL, NULL }, /* RI */
-	{ pres_bline, posts_eq0 }, /* na */
+	{ NULL, posts_eq0 }, /* na */
 	{ NULL, NULL }, /* i */
-	{ pres_bline, posts_sp }, /* sp */
+	{ NULL, posts_le1 }, /* sp */
 	{ pres_bline, posts_eq0 }, /* nf */
 	{ pres_bline, posts_eq0 }, /* fi */
 	{ NULL, NULL }, /* r */
@@ -91,6 +94,15 @@ static	const struct man_valid man_valids[MAN_MAX] = {
 	{ NULL, NULL }, /* DT */
 	{ NULL, NULL }, /* UC */
 	{ NULL, NULL }, /* PD */
+	{ NULL, posts_eq0 }, /* Sp */
+	{ pres_bline, posts_le1 }, /* Vb */
+	{ pres_bline, posts_eq0 }, /* Ve */
+	{ pres_roff, NULL }, /* de */
+	{ pres_roff, NULL }, /* dei */
+	{ pres_roff, NULL }, /* am */
+	{ pres_roff, NULL }, /* ami */
+	{ pres_roff, NULL }, /* ig */
+	{ NULL, NULL }, /* . */
 };
 
 
@@ -155,9 +167,38 @@ check_root(CHKARGS) 
 
 	if (NULL == m->first->child)
 		return(man_nerr(m, n, WNODATA));
-	if (NULL == m->meta.title)
+	if (NULL == m->meta.title) {
+		if ( ! man_nwarn(m, n, WNOTITLE))
+			return(0);
+		/*
+		 * If a title hasn't been set, do so now (by
+		 * implication, date and section also aren't set).
+		 * 
+		 * FIXME: this should be in man_action.c.
+		 */
+	        m->meta.title = mandoc_strdup("unknown");
+		m->meta.date = time(NULL);
+		m->meta.msec = 1;
+	}
+
+	return(1);
+}
+
+
+static int
+check_title(CHKARGS) 
+{
+	const char	*p;
+
+	assert(n->child);
+	if ('\0' == *n->child->string)
 		return(man_nerr(m, n, WNOTITLE));
 
+	for (p = n->child->string; '\0' != *p; p++)
+		if (isalpha((u_char)*p) && ! isupper((u_char)*p))
+			if ( ! man_nwarn(m, n, WTITLECASE))
+				return(0);
+
 	return(1);
 }
 
@@ -281,6 +322,24 @@ check_bline(CHKARGS)
 	assert( ! (MAN_ELINE & m->flags));
 	if (MAN_BLINE & m->flags)
 		return(man_nerr(m, n, WLNSCOPE));
+
 	return(1);
 }
 
+
+static int
+check_roff(CHKARGS)
+{
+
+	if (MAN_BLOCK != n->type)
+		return(1);
+
+	for (n = n->parent; n; n = n->parent)
+		if (MAN_de == n->tok || MAN_dei == n->tok ||
+				MAN_am == n->tok || 
+				MAN_ami == n->tok ||
+				MAN_ig == n->tok)
+			return(man_nerr(m, n, WROFFNEST));
+
+	return(1);
+}