diff options
| author |   schwarze <schwarze@openbsd.org> | 2009-08-09 17:38:24 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2009-08-09 17:38:24 +0000 |
| commit | 53292e81c765004094e44c112f3db2a999360ac0 (patch) | |
| tree | 151506f29dd75ee84336f08b5bdfba4e7b9fbc5c /usr.bin/mandoc/mdoc_validate.c | |
| parent | MLEN < NFS_MAXPATHLEN < MCLBYTES, so there's no need to (diff) | |
| download | wireguard-openbsd-53292e81c765004094e44c112f3db2a999360ac0.tar.xz wireguard-openbsd-53292e81c765004094e44c112f3db2a999360ac0.zip | |
sync to 1.8.2: more .Bl -column fixes, in particular:
1) -column implies -compact
2) do not die from fewer columns than specified (more are still fatal)
Diffstat (limited to 'usr.bin/mandoc/mdoc_validate.c')
| -rw-r--r-- | usr.bin/mandoc/mdoc_validate.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/usr.bin/mandoc/mdoc_validate.c b/usr.bin/mandoc/mdoc_validate.c index cd0f3237df2..27d553cdfeb 100644 --- a/usr.bin/mandoc/mdoc_validate.c +++ b/usr.bin/mandoc/mdoc_validate.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_validate.c,v 1.31 2009/07/26 01:59:46 schwarze Exp $ */ +/* $Id: mdoc_validate.c,v 1.32 2009/08/09 17:38:24 schwarze Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -1024,11 +1024,20 @@ post_it(POST_ARGS) c = mdoc->last->child; for (i = 0; c && MDOC_HEAD == c->type; c = c->next) i++; - if (i == cols) + + if (i < cols) { + if ( ! mdoc_vwarn(mdoc, mdoc->last->line, + mdoc->last->pos, "column " + "mismatch: have %d, want %d", + i, cols)) + return(0); break; - return(mdoc_verr(mdoc, mdoc->last->line, mdoc->last->pos, - "column mismatch (have %d, want %d)", - i, cols)); + } else if (i == cols) + break; + + return(mdoc_verr(mdoc, mdoc->last->line, + mdoc->last->pos, "column mismatch: " + "have %d, want %d", i, cols)); default: break; } |