===================================================================
RCS file: /cvs/mandoc/mdoc_validate.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- mandoc/mdoc_validate.c	2009/06/17 10:53:32	1.12
+++ mandoc/mdoc_validate.c	2009/06/17 11:02:06	1.13
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_validate.c,v 1.12 2009/06/17 10:53:32 kristaps Exp $ */
+/*	$Id: mdoc_validate.c,v 1.13 2009/06/17 11:02:06 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -1072,31 +1072,26 @@ post_bf(POST_ARGS)
 	if (MDOC_BLOCK != mdoc->last->type)
 		return(1);
 
-	/* FIXME: clean-up .*/
-
 	head = mdoc->last->head;
 
 	if (mdoc->last->args && head->child)
+		return(mdoc_err(mdoc, "one argument expected"));
+	else if (mdoc->last->args)
+		return(1);
 
-	if (NULL == mdoc->last->args) {
-		if (NULL == head->child || 
-				MDOC_TEXT != head->child->type)
-			return(mdoc_err(mdoc, "text argument expected"));
+	if (NULL == head->child || MDOC_TEXT != head->child->type)
+		return(mdoc_err(mdoc, "text argument expected"));
 
-		p = head->child->string;
-		if (0 == strcmp(p, "Em"))
-			return(1);
-		else if (0 == strcmp(p, "Li"))
-			return(1);
-		else if (0 == strcmp(p, "Sm"))
-			return(1);
-		return(mdoc_nerr(mdoc, head->child, "invalid font"));
-	}
+	p = head->child->string;
 
-	if (head->child)
-		return(mdoc_err(mdoc, "one argument expected"));
+	if (0 == strcmp(p, "Em"))
+		return(1);
+	else if (0 == strcmp(p, "Li"))
+		return(1);
+	else if (0 == strcmp(p, "Sm"))
+		return(1);
 
-	return(1);
+	return(mdoc_nerr(mdoc, head->child, "invalid font mode"));
 }