===================================================================
RCS file: /cvs/mandoc/man_validate.c,v
retrieving revision 1.52
retrieving revision 1.55
diff -u -p -r1.52 -r1.55
--- mandoc/man_validate.c	2010/12/05 16:14:16	1.52
+++ mandoc/man_validate.c	2010/12/06 15:31:19	1.55
@@ -1,4 +1,4 @@
-/*	$Id: man_validate.c,v 1.52 2010/12/05 16:14:16 kristaps Exp $ */
+/*	$Id: man_validate.c,v 1.55 2010/12/06 15:31:19 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -44,6 +44,7 @@ struct	man_valid {
 
 static	int	  check_bline(CHKARGS);
 static	int	  check_eq0(CHKARGS);
+static	int	  check_ft(CHKARGS);
 static	int	  check_le1(CHKARGS);
 static	int	  check_ge2(CHKARGS);
 static	int	  check_le5(CHKARGS);
@@ -64,6 +65,7 @@ static	v_check	  posts_at[] = { post_AT, NULL };
 static	v_check	  posts_eq0[] = { check_eq0, NULL };
 static	v_check	  posts_fi[] = { check_eq0, post_fi, NULL };
 static	v_check	  posts_le1[] = { check_le1, NULL };
+static	v_check	  posts_ft[] = { check_ft, NULL };
 static	v_check	  posts_nf[] = { check_eq0, post_nf, NULL };
 static	v_check	  posts_par[] = { check_par, NULL };
 static	v_check	  posts_part[] = { check_part, NULL };
@@ -108,6 +110,7 @@ static	const struct man_valid man_valids[MAN_MAX] = {
 	{ NULL, NULL }, /* PD */
 	{ NULL, posts_at }, /* AT */
 	{ NULL, NULL }, /* in */
+	{ NULL, posts_ft }, /* ft */
 };
 
 
@@ -163,9 +166,9 @@ check_root(CHKARGS) 
 {
 
 	if (MAN_BLINE & m->flags)
-		return(man_nmsg(m, n, MANDOCERR_SCOPEEXIT));
-	if (MAN_ELINE & m->flags)
-		return(man_nmsg(m, n, MANDOCERR_SCOPEEXIT));
+		man_nmsg(m, n, MANDOCERR_SCOPEEXIT);
+	else if (MAN_ELINE & m->flags)
+		man_nmsg(m, n, MANDOCERR_SCOPEEXIT);
 
 	m->flags &= ~MAN_BLINE;
 	m->flags &= ~MAN_ELINE;
@@ -174,14 +177,13 @@ check_root(CHKARGS) 
 		man_nmsg(m, n, MANDOCERR_NODOCBODY);
 		return(0);
 	} else if (NULL == m->meta.title) {
-		if ( ! man_nmsg(m, n, MANDOCERR_NOTITLE))
-			return(0);
+		man_nmsg(m, n, MANDOCERR_NOTITLE);
+
 		/*
 		 * 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 = mandoc_strdup("1");
@@ -204,9 +206,11 @@ check_title(CHKARGS) 
 	}
 
 	for (p = n->child->string; '\0' != *p; p++)
-		if (isalpha((u_char)*p) && ! isupper((u_char)*p))
-			if ( ! man_nmsg(m, n, MANDOCERR_UPPERCASE))
-				return(0);
+		/* Only warn about this once... */
+		if (isalpha((u_char)*p) && ! isupper((u_char)*p)) {
+			man_nmsg(m, n, MANDOCERR_UPPERCASE);
+			break;
+		}
 
 	return(1);
 }
@@ -267,7 +271,59 @@ INEQ_DEFINE(1, <=, le1)
 INEQ_DEFINE(2, >=, ge2)
 INEQ_DEFINE(5, <=, le5)
 
+static int
+check_ft(CHKARGS)
+{
+	char	*cp;
+	int	 ok;
 
+	if (0 == n->nchild)
+		return(1);
+
+	ok = 0;
+	cp = n->child->string;
+	switch (*cp) {
+	case ('1'):
+		/* FALLTHROUGH */
+	case ('2'):
+		/* FALLTHROUGH */
+	case ('3'):
+		/* FALLTHROUGH */
+	case ('4'):
+		/* FALLTHROUGH */
+	case ('I'):
+		/* FALLTHROUGH */
+	case ('P'):
+		/* FALLTHROUGH */
+	case ('R'):
+		if ('\0' == cp[1])
+			ok = 1;
+		break;
+	case ('B'):
+		if ('\0' == cp[1] || ('I' == cp[1] && '\0' == cp[2]))
+			ok = 1;
+		break;
+	case ('C'):
+		if ('W' == cp[1] && '\0' == cp[2])
+			ok = 1;
+		break;
+	default:
+		break;
+	}
+
+	if (0 == ok) {
+		man_vmsg(m, MANDOCERR_BADFONT, 
+				n->line, n->pos, "%s", cp);
+		*cp = '\0';
+	}
+
+	if (1 < n->nchild)
+		man_vmsg(m, MANDOCERR_ARGCOUNT, n->line, n->pos,
+				"want one child (have %d)", n->nchild);
+
+	return(1);
+}
+
 static int
 check_sec(CHKARGS)
 {
@@ -276,7 +332,7 @@ check_sec(CHKARGS)
 		man_nmsg(m, n, MANDOCERR_SYNTARGCOUNT);
 		return(0);
 	} else if (MAN_BODY == n->type && 0 == n->nchild)
-		return(man_nmsg(m, n, MANDOCERR_NOBODY));
+		man_nmsg(m, n, MANDOCERR_NOBODY);
 
 	return(1);
 }
@@ -287,7 +343,8 @@ check_part(CHKARGS)
 {
 
 	if (MAN_BODY == n->type && 0 == n->nchild)
-		return(man_nmsg(m, n, MANDOCERR_NOBODY));
+		man_nmsg(m, n, MANDOCERR_NOBODY);
+
 	return(1);
 }
 
@@ -306,9 +363,9 @@ check_par(CHKARGS)
 			/* Body-less lists are ok. */
 			break;
 		default:
-			if (n->nchild)
-				break;
-			return(man_nmsg(m, n, MANDOCERR_NOBODY));
+			if (0 == n->nchild)
+				man_nmsg(m, n, MANDOCERR_NOBODY);
+			break;
 		}
 	if (MAN_HEAD == n->type)
 		switch (n->tok) {
@@ -317,13 +374,11 @@ check_par(CHKARGS)
 		case (MAN_P):
 			/* FALLTHROUGH */
 		case (MAN_LP):
-			if (0 == n->nchild)
-				break;
-			return(man_nmsg(m, n, MANDOCERR_ARGSLOST));
-		default:
 			if (n->nchild)
-				break;
-			return(man_nmsg(m, n, MANDOCERR_NOARGS));
+				man_nmsg(m, n, MANDOCERR_ARGSLOST);
+			break;
+		default:
+			break;
 		}
 
 	return(1);