From 70377ff8dda512b7f705e0999e00dbd173c65803 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Wed, 18 Jul 2012 16:40:52 +0000 Subject: Drop .sp and .br right after .SH and .SS. Fixes vertical spacing after "OPTIONS" in gcc(1). Issue first reported by naddy@ in rsync(1). --- usr.bin/mandoc/man_validate.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) (limited to 'usr.bin/mandoc') diff --git a/usr.bin/mandoc/man_validate.c b/usr.bin/mandoc/man_validate.c index 674e92ffb72..0496b4c1aa5 100644 --- a/usr.bin/mandoc/man_validate.c +++ b/usr.bin/mandoc/man_validate.c @@ -1,7 +1,7 @@ -/* $Id: man_validate.c,v 1.53 2012/06/02 20:07:09 schwarze Exp $ */ +/* $Id: man_validate.c,v 1.54 2012/07/18 16:40:50 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons - * Copyright (c) 2010 Ingo Schwarze + * Copyright (c) 2010, 2012 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -537,12 +537,25 @@ static int post_vs(CHKARGS) { - /* - * Don't warn about this because it occurs in pod2man and would - * cause considerable (unfixable) warnage. - */ - if (NULL == n->prev && MAN_ROOT == n->parent->type) + if (NULL != n->prev) + return(1); + + switch (n->parent->tok) { + case (MAN_SH): + /* FALLTHROUGH */ + case (MAN_SS): + man_nmsg(m, n, MANDOCERR_IGNPAR); + /* FALLTHROUGH */ + case (MAN_MAX): + /* + * Don't warn about this because it occurs in pod2man + * and would cause considerable (unfixable) warnage. + */ man_node_delete(m, n); + break; + default: + break; + } return(1); } -- cgit v1.2.3