===================================================================
RCS file: /cvs/mandoc/man_term.c,v
retrieving revision 1.30
retrieving revision 1.35
diff -u -p -r1.30 -r1.35
--- mandoc/man_term.c	2009/09/15 08:16:20	1.30
+++ mandoc/man_term.c	2009/10/08 23:00:15	1.35
@@ -1,4 +1,4 @@
-/*	$Id: man_term.c,v 1.30 2009/09/15 08:16:20 kristaps Exp $ */
+/*	$Id: man_term.c,v 1.35 2009/10/08 23:00:15 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -18,6 +18,7 @@
 
 #include <assert.h>
 #include <ctype.h>
+#include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -60,10 +61,8 @@ struct	termact {
 
 static	int		  pre_B(DECL_ARGS);
 static	int		  pre_BI(DECL_ARGS);
-static	int		  pre_BR(DECL_ARGS);
 static	int		  pre_HP(DECL_ARGS);
 static	int		  pre_I(DECL_ARGS);
-static	int		  pre_IB(DECL_ARGS);
 static	int		  pre_IP(DECL_ARGS);
 static	int		  pre_IR(DECL_ARGS);
 static	int		  pre_PP(DECL_ARGS);
@@ -90,7 +89,7 @@ static	void		  post_SS(DECL_ARGS);
 static	void		  post_TP(DECL_ARGS);
 static	void		  post_i(DECL_ARGS);
 
-static const struct termact termacts[MAN_MAX] = {
+static	const struct termact termacts[MAN_MAX] = {
 	{ pre_br, NULL }, /* br */
 	{ NULL, NULL }, /* TH */
 	{ pre_SH, post_SH }, /* SH */
@@ -104,8 +103,8 @@ static const struct termact termacts[MAN_MAX] = {
 	{ NULL, NULL }, /* SM */
 	{ pre_B, post_B }, /* SB */
 	{ pre_BI, NULL }, /* BI */
-	{ pre_IB, NULL }, /* IB */
-	{ pre_BR, NULL }, /* BR */
+	{ pre_BI, NULL }, /* IB */
+	{ pre_RB, NULL }, /* BR */
 	{ pre_RB, NULL }, /* RB */
 	{ NULL, NULL }, /* R */
 	{ pre_B, post_B }, /* B */
@@ -129,27 +128,24 @@ extern	size_t		  strlcpy(char *, const char *, size_t)
 extern	size_t		  strlcat(char *, const char *, size_t);
 #endif
 
-static	int		  print_head(struct termp *, 
+static	void		  print_head(struct termp *, 
 				const struct man_meta *);
 static	void		  print_body(DECL_ARGS);
 static	void		  print_node(DECL_ARGS);
-static	int		  print_foot(struct termp *, 
+static	void		  print_foot(struct termp *, 
 				const struct man_meta *);
 static	void		  fmt_block_vspace(struct termp *, 
 				const struct man_node *);
 static	int		  arg_width(const struct man_node *);
 
 
-int
+void
 man_run(struct termp *p, const struct man *m)
 {
 	struct mtermp	 mt;
 
-	if ( ! print_head(p, man_meta(m)))
-		return(0);
+	print_head(p, man_meta(m));
 	p->flags |= TERMP_NOSPACE;
-	assert(man_node(m));
-	assert(MAN_ROOT == man_node(m)->type);
 
 	mt.fl = 0;
 	mt.lmargin = INDENT;
@@ -157,10 +153,7 @@ man_run(struct termp *p, const struct man *m)
 
 	if (man_node(m)->child)
 		print_body(p, &mt, man_node(m)->child, man_meta(m));
-	if ( ! print_foot(p, man_meta(m)))
-		return(0);
-
-	return(1);
+	print_foot(p, man_meta(m));
 }
 
 
@@ -300,43 +293,26 @@ pre_IR(DECL_ARGS)
 
 /* ARGSUSED */
 static int
-pre_IB(DECL_ARGS)
-{
-	const struct man_node *nn;
-	int		 i;
-
-	for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
-		if (i % 2)
-			p->bold++;
-		else
-			p->under++;
-		if (i > 0)
-			p->flags |= TERMP_NOSPACE;
-		print_node(p, mt, nn, m);
-		if (i % 2)
-			p->bold--;
-		else
-			p->under--;
-	}
-	return(0);
-}
-
-
-/* ARGSUSED */
-static int
 pre_RB(DECL_ARGS)
 {
 	const struct man_node *nn;
 	int		 i;
 
 	for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
-		if (i % 2)
+		if (i % 2 && MAN_RB == n->tok)
 			p->bold++;
+		else if ( ! (i % 2) && MAN_RB != n->tok)
+			p->bold++;
+
 		if (i > 0)
 			p->flags |= TERMP_NOSPACE;
+
 		print_node(p, mt, nn, m);
-		if (i % 2)
+
+		if (i % 2 && MAN_RB == n->tok)
 			p->bold--;
+		else if ( ! (i % 2) && MAN_RB != n->tok)
+			p->bold--;
 	}
 	return(0);
 }
@@ -364,43 +340,33 @@ pre_RI(DECL_ARGS)
 
 /* ARGSUSED */
 static int
-pre_BR(DECL_ARGS)
-{
-	const struct man_node *nn;
-	int		 i;
-
-	for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
-		if ( ! (i % 2))
-			p->bold++;
-		if (i > 0)
-			p->flags |= TERMP_NOSPACE;
-		print_node(p, mt, nn, m);
-		if ( ! (i % 2))
-			p->bold--;
-	}
-	return(0);
-}
-
-
-/* ARGSUSED */
-static int
 pre_BI(DECL_ARGS)
 {
-	const struct man_node *nn;
-	int		 i;
+	const struct man_node	*nn;
+	int			 i;
 
 	for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
-		if (i % 2)
+		if (i % 2 && MAN_BI == n->tok)
 			p->under++;
-		else
+		else if (i % 2)
 			p->bold++;
-		if (i > 0)
+		else if (MAN_BI == n->tok)
+			p->bold++;
+		else
+			p->under++;
+
+		if (i)
 			p->flags |= TERMP_NOSPACE;
 		print_node(p, mt, nn, m);
-		if (i % 2)
+
+		if (i % 2 && MAN_BI == n->tok)
 			p->under--;
-		else
+		else if (i % 2)
 			p->bold--;
+		else if (MAN_BI == n->tok)
+			p->bold--;
+		else
+			p->under--;
 	}
 	return(0);
 }
@@ -920,19 +886,16 @@ print_body(DECL_ARGS)
 }
 
 
-static int
+static void
 print_foot(struct termp *p, const struct man_meta *meta)
 {
 	struct tm	*tm;
-	char		*buf;
+	char		 buf[BUFSIZ];
 
-	if (NULL == (buf = malloc(p->rmargin)))
-		return(0);
-
 	tm = localtime(&meta->date);
 
 	if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm))
-		buf[0] = 0;
+		(void)strlcpy(buf, "(invalid date)", BUFSIZ);
 
 	term_vspace(p);
 
@@ -953,13 +916,10 @@ print_foot(struct termp *p, const struct man_meta *met
 
 	term_word(p, buf);
 	term_flushln(p);
-
-	free(buf);
-	return(1);
 }
 
 
-static int
+static void
 print_head(struct termp *p, const struct man_meta *meta)
 {
 	char		*buf, *title;
@@ -968,9 +928,9 @@ print_head(struct termp *p, const struct man_meta *met
 	p->offset = 0;
 
 	if (NULL == (buf = malloc(p->rmargin)))
-		return(0);
+		err(EXIT_FAILURE, "malloc");
 	if (NULL == (title = malloc(p->rmargin)))
-		return(0);
+		err(EXIT_FAILURE, "malloc");
 
 	if (meta->vol)
 		(void)strlcpy(buf, meta->vol, p->rmargin);
@@ -1008,6 +968,5 @@ print_head(struct termp *p, const struct man_meta *met
 
 	free(title);
 	free(buf);
-	return(1);
 }