From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from krisdoz.my.domain (kristaps@localhost [127.0.0.1])
	by krisdoz.my.domain (8.14.3/8.14.3) with ESMTP id o6MDlobF013522
	for <source@mdocml.bsd.lv>; Thu, 22 Jul 2010 09:47:51 -0400 (EDT)
Received: (from kristaps@localhost)
	by krisdoz.my.domain (8.14.3/8.14.3/Submit) id o6MDlo9J017920;
	Thu, 22 Jul 2010 09:47:50 -0400 (EDT)
Date: Thu, 22 Jul 2010 09:47:50 -0400 (EDT)
Message-Id: <201007221347.o6MDlo9J017920@krisdoz.my.domain>
X-Mailinglist: mdocml-source
Reply-To: source@mdocml.bsd.lv
MIME-Version: 1.0
From: kristaps@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: Bring `sp', `Sp', and `br' behaviour for -man in line with how 
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8

Log Message:
-----------
Bring `sp', `Sp', and `br' behaviour for -man in line with how -mdoc's
is handled: correctly.  This removes superfluous line breaks in many
-man manuals.

Modified Files:
--------------
    mdocml:
        man_term.c

Revision Data
-------------
Index: man_term.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man_term.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -Lman_term.c -Lman_term.c -u -p -r1.81 -r1.82
--- man_term.c
+++ man_term.c
@@ -92,7 +92,6 @@ static	int		  pre_RS(DECL_ARGS);
 static	int		  pre_SH(DECL_ARGS);
 static	int		  pre_SS(DECL_ARGS);
 static	int		  pre_TP(DECL_ARGS);
-static	int		  pre_br(DECL_ARGS);
 static	int		  pre_fi(DECL_ARGS);
 static	int		  pre_ign(DECL_ARGS);
 static	int		  pre_nf(DECL_ARGS);
@@ -106,7 +105,7 @@ static	void		  post_SS(DECL_ARGS);
 static	void		  post_TP(DECL_ARGS);
 
 static	const struct termact termacts[MAN_MAX] = {
-	{ pre_br, NULL, MAN_NOTEXT }, /* br */
+	{ pre_sp, NULL, MAN_NOTEXT }, /* br */
 	{ NULL, NULL, 0 }, /* TH */
 	{ pre_SH, post_SH, 0 }, /* SH */
 	{ pre_SS, post_SS, 0 }, /* SS */
@@ -359,24 +358,20 @@ pre_sp(DECL_ARGS)
 {
 	size_t		 i, len;
 
-	len = n->child ? 
-		a2height(p, n->child->string) : term_len(p, 1);
+	switch (n->tok) {
+	case (MAN_br):
+		len = 0;
+		break;
+	default:
+		len = n->child ? a2height(p, n->child->string) : 1;
+		break;
+	}
 
 	if (0 == len)
 		term_newln(p);
-	for (i = 0; i <= len; i++)
+	for (i = 0; i < len; i++)
 		term_vspace(p);
 
-	return(0);
-}
-
-
-/* ARGSUSED */
-static int
-pre_br(DECL_ARGS)
-{
-
-	term_newln(p);
 	return(0);
 }
 
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv