diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2015-02-05 01:46:56 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2015-02-05 01:46:56 +0000 |
| commit | 068bdebaf39570b6a01506886f67b47bbb8e6fd2 (patch) | |
| tree | 0af8692dcb3517aafb3bb2ca8aeaf7d38c1fe8e0 | |
| parent | 4f91009f8aa8fa191505ff44484c023b578795b2 (diff) | |
| download | mandoc-068bdebaf39570b6a01506886f67b47bbb8e6fd2.tar.gz mandoc-068bdebaf39570b6a01506886f67b47bbb8e6fd2.tar.zst mandoc-068bdebaf39570b6a01506886f67b47bbb8e6fd2.zip | |
fix handling of empty .An macros
| -rw-r--r-- | mdoc_html.c | 5 | ||||
| -rw-r--r-- | mdoc_macro.c | 4 | ||||
| -rw-r--r-- | mdoc_term.c | 5 | ||||
| -rw-r--r-- | mdoc_validate.c | 12 |
4 files changed, 11 insertions, 15 deletions
diff --git a/mdoc_html.c b/mdoc_html.c index 5b7fc742..88037fad 100644 --- a/mdoc_html.c +++ b/mdoc_html.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_html.c,v 1.222 2015/02/05 00:14:13 schwarze Exp $ */ +/* $Id: mdoc_html.c,v 1.223 2015/02/05 01:46:56 schwarze Exp $ */ /* * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> @@ -1253,9 +1253,6 @@ mdoc_an_pre(MDOC_ARGS) return(0); } - if (n->child == NULL) - return(0); - if (h->flags & HTML_SPLIT) print_otag(h, TAG_BR, 0, NULL); diff --git a/mdoc_macro.c b/mdoc_macro.c index 86edb030..b9abaf5d 100644 --- a/mdoc_macro.c +++ b/mdoc_macro.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_macro.c,v 1.175 2015/02/05 00:14:13 schwarze Exp $ */ +/* $Id: mdoc_macro.c,v 1.176 2015/02/05 01:46:56 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org> @@ -772,7 +772,7 @@ in_line(MACRO_PROT_ARGS) */ if (ac == ARGS_PUNCT) { - if (cnt == 0 && nc == 0) + if (cnt == 0 && (nc == 0 || tok == MDOC_An)) mdoc->flags |= MDOC_NODELIMC; break; } diff --git a/mdoc_term.c b/mdoc_term.c index cfd577a8..1c37b203 100644 --- a/mdoc_term.c +++ b/mdoc_term.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_term.c,v 1.307 2015/02/05 00:14:13 schwarze Exp $ */ +/* $Id: mdoc_term.c,v 1.308 2015/02/05 01:46:56 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org> @@ -1091,9 +1091,6 @@ termp_an_pre(DECL_ARGS) return(0); } - if (n->child == NULL) - return(0); - if (p->flags & TERMP_SPLIT) term_newln(p); diff --git a/mdoc_validate.c b/mdoc_validate.c index c6cf2c61..c600fa3e 100644 --- a/mdoc_validate.c +++ b/mdoc_validate.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_validate.c,v 1.270 2015/02/04 22:30:10 schwarze Exp $ */ +/* $Id: mdoc_validate.c,v 1.271 2015/02/05 01:46:56 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org> @@ -1168,10 +1168,12 @@ post_an(POST_ARGS) struct mdoc_node *np, *nch; np = mdoc->last; - if (AUTH__NONE == np->norm->An.auth) { - if (0 == np->child) - check_count(mdoc, MDOC_ELEM, CHECK_GT, 0); - } else if ((nch = np->child) != NULL) + nch = np->child; + if (np->norm->An.auth == AUTH__NONE) { + if (nch == NULL) + mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, + np->line, np->pos, "An"); + } else if (nch != NULL) mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse, nch->line, nch->pos, "An ... %s", nch->string); } |