Make sure that `br' and `sp' don't emit space before the initial `SH' in

-man.  This actually seems to be what groff does.  Sort-of.  Anyway,
it's required to get perlpod pages rendered nicely, so until perlpod
stops producing shit, do it.  Ok schwarze@.

diff --git a/man_validate.c b/man_validate.c
index e0c882d49b439f3a8677d7db5a0ec1cc21d6c67a..63d80129f29154dd6eae25cf642d6eecb8eedd14 100644 (file)
--- a/man_validate.c
+++ b/man_validate.c
@@ -1,4 +1,4 @@
-/*     $Id: man_validate.c,v 1.69 2011/04/13 09:57:08 kristaps Exp $ */
+/*     $Id: man_validate.c,v 1.70 2011/07/08 09:34:06 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -57,27 +57,28 @@ static      int       check_sec(CHKARGS);
 static void      check_text(CHKARGS);
 
 static int       post_AT(CHKARGS);
+static int       post_vs(CHKARGS);
 static int       post_fi(CHKARGS);
 static int       post_nf(CHKARGS);
 static int       post_TH(CHKARGS);
 static int       post_UC(CHKARGS);
 
 static v_check   posts_at[] = { post_AT, NULL };
+static v_check   posts_br[] = { post_vs, check_eq0, NULL };
 static v_check   posts_eq0[] = { check_eq0, NULL };
 static v_check   posts_fi[] = { check_eq0, post_fi, NULL };
-static v_check   posts_le1[] = { check_le1, NULL };
 static v_check   posts_ft[] = { check_ft, NULL };
 static v_check   posts_nf[] = { check_eq0, post_nf, NULL };
 static v_check   posts_par[] = { check_par, NULL };
 static v_check   posts_part[] = { check_part, NULL };
 static v_check   posts_sec[] = { check_sec, NULL };
+static v_check   posts_sp[] = { post_vs, check_le1, NULL };
 static v_check   posts_th[] = { check_ge2, check_le5, post_TH, NULL };
 static v_check   posts_uc[] = { post_UC, NULL };
 static v_check   pres_bline[] = { check_bline, NULL };
 
-
 static const struct man_valid man_valids[MAN_MAX] = {
-       { NULL, posts_eq0 }, /* br */
+       { NULL, posts_br }, /* br */
        { pres_bline, posts_th }, /* TH */
        { pres_bline, posts_sec }, /* SH */
        { pres_bline, posts_sec }, /* SS */
@@ -99,7 +100,7 @@ static       const struct man_valid man_valids[MAN_MAX] = {
        { NULL, NULL }, /* IR */
        { NULL, NULL }, /* RI */
        { NULL, posts_eq0 }, /* na */ /* FIXME: should warn only. */
-       { NULL, posts_le1 }, /* sp */ /* FIXME: should warn only. */
+       { NULL, posts_sp }, /* sp */ /* FIXME: should warn only. */
        { pres_bline, posts_nf }, /* nf */
        { pres_bline, posts_fi }, /* fi */
        { NULL, NULL }, /* RE */
@@ -558,3 +559,17 @@ post_AT(CHKARGS)
        m->meta.source = mandoc_strdup(p);
        return(1);
 }
+
+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)
+               man_node_delete(m, n);
+
+       return(1);
+}