===================================================================
RCS file: /cvs/mandoc/mdoc_term.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- mandoc/mdoc_term.c	2009/11/10 11:45:57	1.101
+++ mandoc/mdoc_term.c	2009/11/12 05:50:12	1.102
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.101 2009/11/10 11:45:57 kristaps Exp $ */
+/*	$Id: mdoc_term.c,v 1.102 2009/11/12 05:50:12 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -59,9 +59,9 @@ static	int	  arg_listtype(const struct mdoc_node *);
 static	void	  print_bvspace(struct termp *,
 			const struct mdoc_node *,
 			const struct mdoc_node *);
-static	void  	  print_node(DECL_ARGS);
-static	void	  print_head(DECL_ARGS);
-static	void	  print_body(DECL_ARGS);
+static	void  	  print_mdoc_node(DECL_ARGS);
+static	void	  print_mdoc_head(DECL_ARGS);
+static	void	  print_mdoc_nodelist(DECL_ARGS);
 static	void	  print_foot(DECL_ARGS);
 
 #ifdef __linux__
@@ -116,6 +116,7 @@ static	int	  termp_fo_pre(DECL_ARGS);
 static	int	  termp_ft_pre(DECL_ARGS);
 static	int	  termp_in_pre(DECL_ARGS);
 static	int	  termp_it_pre(DECL_ARGS);
+static	int	  termp_li_pre(DECL_ARGS);
 static	int	  termp_lk_pre(DECL_ARGS);
 static	int	  termp_nd_pre(DECL_ARGS);
 static	int	  termp_nm_pre(DECL_ARGS);
@@ -167,7 +168,7 @@ static	const struct termact termacts[MDOC_MAX] = {
 	{ termp_ft_pre, termp_ft_post }, /* Ft */ 
 	{ termp_bold_pre, NULL }, /* Ic */ 
 	{ termp_in_pre, termp_in_post }, /* In */ 
-	{ NULL, NULL }, /* Li */
+	{ termp_li_pre, NULL }, /* Li */
 	{ termp_nd_pre, NULL }, /* Nd */ 
 	{ termp_nm_pre, NULL }, /* Nm */ 
 	{ termp_op_pre, termp_op_post }, /* Op */
@@ -283,36 +284,36 @@ terminal_mdoc(void *arg, const struct mdoc *mdoc)
 	n = mdoc_node(mdoc);
 	m = mdoc_meta(mdoc);
 
-	print_head(p, NULL, m, n);
+	print_mdoc_head(p, NULL, m, n);
 	if (n->child)
-		print_body(p, NULL, m, n->child);
+		print_mdoc_nodelist(p, NULL, m, n->child);
 	print_foot(p, NULL, m, n);
 }
 
 
 static void
-print_body(DECL_ARGS)
+print_mdoc_nodelist(DECL_ARGS)
 {
 
-	print_node(p, pair, m, n);
+	print_mdoc_node(p, pair, m, n);
 	if (n->next)
-		print_body(p, pair, m, n->next);
+		print_mdoc_nodelist(p, pair, m, n->next);
 }
 
 
 /* ARGSUSED */
 static void
-print_node(DECL_ARGS)
+print_mdoc_node(DECL_ARGS)
 {
-	int		 chld, bold, under;
+	int		 chld;
+	const void	*font;
 	struct termpair	 npair;
 	size_t		 offset, rmargin;
 
 	chld = 1;
 	offset = p->offset;
 	rmargin = p->rmargin;
-	bold = p->bold;
-	under = p->under;
+	font = term_fontq(p);
 
 	memset(&npair, 0, sizeof(struct termpair));
 	npair.ppair = pair;
@@ -322,18 +323,12 @@ print_node(DECL_ARGS)
 			chld = (*termacts[n->tok].pre)(p, &npair, m, n);
 	} else 
 		term_word(p, n->string); 
+
 	if (chld && n->child)
-		print_body(p, &npair, m, n->child);
+		print_mdoc_nodelist(p, &npair, m, n->child);
 
-	/*
-	 * XXX - if bold/under were to span scopes, this wouldn't be
-	 * possible, but because decoration is always in-scope, we can
-	 * get away with this.
-	 */
+	term_fontpopq(p, font);
 
-	p->bold = bold;
-	p->under = under;
-
 	if (MDOC_TEXT != n->type)
 		if (termacts[n->tok].post)
 			(*termacts[n->tok].post)(p, &npair, m, n);
@@ -349,8 +344,7 @@ print_foot(DECL_ARGS)
 {
 	char		buf[DATESIZ], os[BUFSIZ];
 
-	/* Disable meta-fonts. */
-	p->metafont = 0;
+	term_fontrepl(p, TERMFONT_NONE);
 
 	/* 
 	 * Output the footer in new-groff style, that is, three columns
@@ -393,10 +387,9 @@ print_foot(DECL_ARGS)
 }
 
 
-/* FIXME: put in utility library. */
 /* ARGSUSED */
 static void
-print_head(DECL_ARGS)
+print_mdoc_head(DECL_ARGS)
 {
 	char		buf[BUFSIZ], title[BUFSIZ];
 
@@ -782,7 +775,7 @@ termp_it_pre(DECL_ARGS)
 	switch (type) {
 	case (MDOC_Diag):
 		if (MDOC_HEAD == n->type)
-			p->bold++;
+			term_fontpush(p, TERMFONT_BOLD);
 		break;
 	default:
 		break;
@@ -920,16 +913,16 @@ termp_it_pre(DECL_ARGS)
 	if (MDOC_HEAD == n->type)
 		switch (type) {
 		case (MDOC_Bullet):
-			p->bold++;
+			term_fontpush(p, TERMFONT_BOLD);
 			term_word(p, "\\[bu]");
-			p->bold--;
+			term_fontpop(p);
 			break;
 		case (MDOC_Dash):
 			/* FALLTHROUGH */
 		case (MDOC_Hyphen):
-			p->bold++;
+			term_fontpush(p, TERMFONT_BOLD);
 			term_word(p, "\\(hy");
-			p->bold--;
+			term_fontpop(p);
 			break;
 		case (MDOC_Enum):
 			(pair->ppair->ppair->count)++;
@@ -1011,7 +1004,9 @@ termp_nm_pre(DECL_ARGS)
 
 	if (SEC_SYNOPSIS == n->sec)
 		term_newln(p);
-	p->bold++;
+
+	term_fontpush(p, TERMFONT_BOLD);
+
 	if (NULL == n->child)
 		term_word(p, m->name);
 	return(1);
@@ -1023,7 +1018,7 @@ static int
 termp_fl_pre(DECL_ARGS)
 {
 
-	p->bold++;
+	term_fontpush(p, TERMFONT_BOLD);
 	term_word(p, "\\-");
 	p->flags |= TERMP_NOSPACE;
 	return(1);
@@ -1121,9 +1116,9 @@ termp_rv_pre(DECL_ARGS)
 	term_word(p, "The");
 
 	for (nn = n->child; nn; nn = nn->next) {
-		p->bold++;
+		term_fontpush(p, TERMFONT_BOLD);
 		term_word(p, nn->string);
-		p->bold--;
+		term_fontpop(p);
 		p->flags |= TERMP_NOSPACE;
 		if (nn->next && NULL == nn->next->next)
 			term_word(p, "(), and");
@@ -1141,9 +1136,9 @@ termp_rv_pre(DECL_ARGS)
        	term_word(p, "the value 0 if successful; otherwise the value "
 			"-1 is returned and the global variable");
 
-	p->under++;
+	term_fontpush(p, TERMFONT_UNDER);
 	term_word(p, "errno");
-	p->under--;
+	term_fontpop(p);
 
        	term_word(p, "is set to indicate the error.");
 
@@ -1160,9 +1155,9 @@ termp_ex_pre(DECL_ARGS)
 	term_word(p, "The");
 
 	for (nn = n->child; nn; nn = nn->next) {
-		p->bold++;
+		term_fontpush(p, TERMFONT_BOLD);
 		term_word(p, nn->string);
-		p->bold--;
+		term_fontpop(p);
 		p->flags |= TERMP_NOSPACE;
 		if (nn->next && NULL == nn->next->next)
 			term_word(p, ", and");
@@ -1264,7 +1259,7 @@ static int
 termp_bold_pre(DECL_ARGS)
 {
 
-	p->bold++;
+	term_fontpush(p, TERMFONT_BOLD);
 	return(1);
 }
 
@@ -1298,7 +1293,7 @@ termp_sh_pre(DECL_ARGS)
 		term_vspace(p);
 		break;
 	case (MDOC_HEAD):
-		p->bold++;
+		term_fontpush(p, TERMFONT_BOLD);
 		break;
 	case (MDOC_BODY):
 		p->offset = INDENT;
@@ -1433,7 +1428,8 @@ termp_ft_pre(DECL_ARGS)
 	if (SEC_SYNOPSIS == n->sec)
 		if (n->prev && MDOC_Fo == n->prev->tok)
 			term_vspace(p);
-	p->under++;
+
+	term_fontpush(p, TERMFONT_UNDER);
 	return(1);
 }
 
@@ -1454,17 +1450,18 @@ termp_fn_pre(DECL_ARGS)
 {
 	const struct mdoc_node	*nn;
 
-	p->bold++;
+	term_fontpush(p, TERMFONT_BOLD);
 	term_word(p, n->child->string);
-	p->bold--;
+	term_fontpop(p);
 
 	p->flags |= TERMP_NOSPACE;
 	term_word(p, "(");
 
 	for (nn = n->child->next; nn; nn = nn->next) {
-		p->under++;
+		term_fontpush(p, TERMFONT_UNDER);
 		term_word(p, nn->string);
-		p->under--;
+		term_fontpop(p);
+
 		if (nn->next)
 			term_word(p, ",");
 	}
@@ -1495,14 +1492,15 @@ termp_fa_pre(DECL_ARGS)
 	const struct mdoc_node	*nn;
 
 	if (n->parent->tok != MDOC_Fo) {
-		p->under++;
+		term_fontpush(p, TERMFONT_UNDER);
 		return(1);
 	}
 
 	for (nn = n->child; nn; nn = nn->next) {
-		p->under++;
+		term_fontpush(p, TERMFONT_UNDER);
 		term_word(p, nn->string);
-		p->under--;
+		term_fontpop(p);
+
 		if (nn->next)
 			term_word(p, ",");
 	}
@@ -1564,7 +1562,7 @@ termp_bd_pre(DECL_ARGS)
 
 	for (nn = n->child; nn; nn = nn->next) {
 		p->flags |= TERMP_NOSPACE;
-		print_node(p, pair, m, nn);
+		print_mdoc_node(p, pair, m, nn);
 		if (NULL == nn->next)
 			continue;
 		if (nn->prev && nn->prev->line < nn->line)
@@ -1718,7 +1716,7 @@ termp_ss_pre(DECL_ARGS)
 			term_vspace(p);
 		break;
 	case (MDOC_HEAD):
-		p->bold++;
+		term_fontpush(p, TERMFONT_BOLD);
 		p->offset = HALFINDENT;
 		break;
 	default:
@@ -1744,7 +1742,7 @@ static int
 termp_cd_pre(DECL_ARGS)
 {
 
-	p->bold++;
+	term_fontpush(p, TERMFONT_BOLD);
 	term_newln(p);
 	return(1);
 }
@@ -1755,7 +1753,7 @@ static int
 termp_in_pre(DECL_ARGS)
 {
 
-	p->bold++;
+	term_fontpush(p, TERMFONT_BOLD);
 	if (SEC_SYNOPSIS == n->sec)
 		term_word(p, "#include");
 
@@ -1770,10 +1768,10 @@ static void
 termp_in_post(DECL_ARGS)
 {
 
-	p->bold++;
+	term_fontpush(p, TERMFONT_BOLD);
 	p->flags |= TERMP_NOSPACE;
 	term_word(p, ">");
-	p->bold--;
+	term_fontpop(p);
 
 	if (SEC_SYNOPSIS != n->sec)
 		return;
@@ -1905,12 +1903,12 @@ termp_fo_pre(DECL_ARGS)
 	} else if (MDOC_HEAD != n->type) 
 		return(1);
 
-	p->bold++;
+	term_fontpush(p, TERMFONT_BOLD);
 	for (nn = n->child; nn; nn = nn->next) {
 		assert(MDOC_TEXT == nn->type);
 		term_word(p, nn->string);
 	}
-	p->bold--;
+	term_fontpop(p);
 
 	return(0);
 }
@@ -1944,18 +1942,22 @@ termp_bf_pre(DECL_ARGS)
 
 	if (NULL == (nn = n->head->child)) {
 		if (arg_hasattr(MDOC_Emphasis, n))
-			p->under++;
+			term_fontpush(p, TERMFONT_UNDER);
 		else if (arg_hasattr(MDOC_Symbolic, n))
-			p->bold++;
+			term_fontpush(p, TERMFONT_BOLD);
+		else
+			term_fontpush(p, TERMFONT_NONE);
 
 		return(1);
 	} 
 
 	assert(MDOC_TEXT == nn->type);
 	if (0 == strcmp("Em", nn->string))
-		p->under++;
+		term_fontpush(p, TERMFONT_UNDER);
 	else if (0 == strcmp("Sy", nn->string))
-		p->bold++;
+		term_fontpush(p, TERMFONT_BOLD);
+	else
+		term_fontpush(p, TERMFONT_NONE);
 
 	return(1);
 }
@@ -2011,26 +2013,36 @@ termp____post(DECL_ARGS)
 
 /* ARGSUSED */
 static int
+termp_li_pre(DECL_ARGS)
+{
+
+	term_fontpush(p, TERMFONT_NONE);
+	return(1);
+}
+
+
+/* ARGSUSED */
+static int
 termp_lk_pre(DECL_ARGS)
 {
 	const struct mdoc_node *nn;
 
-	p->under++;
+	term_fontpush(p, TERMFONT_UNDER);
 	nn = n->child;
 
 	if (NULL == nn->next)
 		return(1);
 
 	term_word(p, nn->string);
-	p->under--;
+	term_fontpop(p);
 
 	p->flags |= TERMP_NOSPACE;
 	term_word(p, ":");
 
-	p->bold++;
+	term_fontpush(p, TERMFONT_BOLD);
 	for (nn = nn->next; nn; nn = nn->next) 
 		term_word(p, nn->string);
-	p->bold--;
+	term_fontpop(p);
 
 	return(0);
 }
@@ -2041,7 +2053,7 @@ static int
 termp_under_pre(DECL_ARGS)
 {
 
-	p->under++;
+	term_fontpush(p, TERMFONT_UNDER);
 	return(1);
 }