Cleaned up .Bf validator.

diff --git a/mdoc_argv.c b/mdoc_argv.c
index 0587d9ccda435cb6c2efbed934128faa49d57c50..36bd749c91dd28a71b108665f450ea04f4a96594 100644 (file)
--- a/mdoc_argv.c
+++ b/mdoc_argv.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_argv.c,v 1.5 2009/06/16 19:45:51 kristaps Exp $ */
+/*     $Id: mdoc_argv.c,v 1.6 2009/06/17 11:02:06 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -32,6 +32,8 @@
  * There's no limit to the number or arguments that may be allocated.
  */
 
+/* FIXME .Bf Li raises "macro-like parameter". */
+
 #define        ARGS_QUOTED     (1 << 0)
 #define        ARGS_DELIM      (1 << 1)
 #define        ARGS_TABSEP     (1 << 2)

diff --git a/mdoc_validate.c b/mdoc_validate.c
index e628b28f02116ecc8344b613346a40e59fb2c5d2..81211db4c9855e732b40db55751c276bec8be37e 100644 (file)
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -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"));
 }