diff options
| author |   Kristaps Dzonsons <kristaps@bsd.lv> | 2009-06-17 11:02:06 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2009-06-17 11:02:06 +0000 |
| commit | e4f6b8bbfc80228e5d06e0e611f6f7a939c1af51 (patch) | |
| tree | efecadfb6b13b9aaac95fe18e38dd15ee4fe6b3a | |
| parent | 112069844468772da75bff132e76dc021a0d51cc (diff) | |
| download | mandoc-e4f6b8bbfc80228e5d06e0e611f6f7a939c1af51.tar.gz mandoc-e4f6b8bbfc80228e5d06e0e611f6f7a939c1af51.tar.zst mandoc-e4f6b8bbfc80228e5d06e0e611f6f7a939c1af51.zip | |
Cleaned up .Bf validator.
| -rw-r--r-- | mdoc_argv.c | 4 | ||||
| -rw-r--r-- | mdoc_validate.c | 33 |
2 files changed, 17 insertions, 20 deletions
diff --git a/mdoc_argv.c b/mdoc_argv.c index 0587d9cc..36bd749c 100644 --- 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 e628b28f..81211db4 100644 --- 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")); } |