===================================================================
RCS file: /cvs/mandoc/mdoc_term.c,v
retrieving revision 1.317
retrieving revision 1.326
diff -u -p -r1.317 -r1.326
--- mandoc/mdoc_term.c	2015/04/04 17:47:18	1.317
+++ mandoc/mdoc_term.c	2015/09/21 13:25:00	1.326
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.317 2015/04/04 17:47:18 schwarze Exp $ */
+/*	$Id: mdoc_term.c,v 1.326 2015/09/21 13:25:00 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -34,6 +34,7 @@
 #include "mdoc.h"
 #include "out.h"
 #include "term.h"
+#include "tag.h"
 #include "main.h"
 
 struct	termpair {
@@ -94,6 +95,7 @@ static	int	  termp_bx_pre(DECL_ARGS);
 static	int	  termp_cd_pre(DECL_ARGS);
 static	int	  termp_d1_pre(DECL_ARGS);
 static	int	  termp_eo_pre(DECL_ARGS);
+static	int	  termp_er_pre(DECL_ARGS);
 static	int	  termp_ex_pre(DECL_ARGS);
 static	int	  termp_fa_pre(DECL_ARGS);
 static	int	  termp_fd_pre(DECL_ARGS);
@@ -117,6 +119,7 @@ static	int	  termp_skip_pre(DECL_ARGS);
 static	int	  termp_sm_pre(DECL_ARGS);
 static	int	  termp_sp_pre(DECL_ARGS);
 static	int	  termp_ss_pre(DECL_ARGS);
+static	int	  termp_tag_pre(DECL_ARGS);
 static	int	  termp_under_pre(DECL_ARGS);
 static	int	  termp_ud_pre(DECL_ARGS);
 static	int	  termp_vt_pre(DECL_ARGS);
@@ -143,9 +146,9 @@ static	const struct termact termacts[MDOC_MAX] = {
 	{ termp_under_pre, NULL }, /* Ar */
 	{ termp_cd_pre, NULL }, /* Cd */
 	{ termp_bold_pre, NULL }, /* Cm */
-	{ NULL, NULL }, /* Dv */
-	{ NULL, NULL }, /* Er */
-	{ NULL, NULL }, /* Ev */
+	{ termp_li_pre, NULL }, /* Dv */
+	{ termp_er_pre, NULL }, /* Er */
+	{ termp_tag_pre, NULL }, /* Ev */
 	{ termp_ex_pre, NULL }, /* Ex */
 	{ termp_fa_pre, NULL }, /* Fa */
 	{ termp_fd_pre, termp_fd_post }, /* Fd */
@@ -249,29 +252,27 @@ static	const struct termact termacts[MDOC_MAX] = {
 	{ termp_ll_pre, NULL }, /* ll */
 };
 
+static	int	 fn_prio;
 
 void
-terminal_mdoc(void *arg, const struct mdoc *mdoc)
+terminal_mdoc(void *arg, const struct roff_man *mdoc)
 {
-	const struct roff_meta	*meta;
 	struct roff_node	*n;
 	struct termp		*p;
 
 	p = (struct termp *)arg;
-
 	p->overstep = 0;
 	p->rmargin = p->maxrmargin = p->defrmargin;
 	p->tabwidth = term_len(p, 5);
 
-	n = mdoc_node(mdoc)->child;
-	meta = mdoc_meta(mdoc);
-
+	n = mdoc->first->child;
 	if (p->synopsisonly) {
 		while (n != NULL) {
 			if (n->tok == MDOC_Sh && n->sec == SEC_SYNOPSIS) {
 				if (n->child->next->child != NULL)
 					print_mdoc_nodelist(p, NULL,
-					    meta, n->child->next->child);
+					    &mdoc->meta,
+					    n->child->next->child);
 				term_newln(p);
 				break;
 			}
@@ -280,11 +281,12 @@ terminal_mdoc(void *arg, const struct mdoc *mdoc)
 	} else {
 		if (p->defindent == 0)
 			p->defindent = 5;
-		term_begin(p, print_mdoc_head, print_mdoc_foot, meta);
+		term_begin(p, print_mdoc_head, print_mdoc_foot,
+		    &mdoc->meta);
 		if (n != NULL) {
 			if (n->tok != MDOC_Sh)
 				term_vspace(p);
-			print_mdoc_nodelist(p, NULL, meta, n);
+			print_mdoc_nodelist(p, NULL, &mdoc->meta, n);
 		}
 		term_end(p);
 	}
@@ -800,7 +802,7 @@ termp_it_pre(DECL_ARGS)
 		if (n->type != ROFFT_HEAD)
 			break;
 
-		p->flags |= TERMP_NOBREAK | TERMP_BRIND;
+		p->flags |= TERMP_NOBREAK | TERMP_BRTRSP | TERMP_BRIND;
 		p->trailspace = 2;
 
 		if (NULL == n->next || NULL == n->next->child)
@@ -972,7 +974,7 @@ termp_it_post(DECL_ARGS)
 	 * has munged them in the meanwhile.
 	 */
 
-	p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND |
+	p->flags &= ~(TERMP_NOBREAK | TERMP_BRTRSP | TERMP_BRIND |
 			TERMP_DANGLE | TERMP_HANG);
 	p->trailspace = 0;
 }
@@ -1051,6 +1053,7 @@ static int
 termp_fl_pre(DECL_ARGS)
 {
 
+	termp_tag_pre(p, pair, meta, n);
 	term_fontpush(p, TERMFONT_BOLD);
 	term_word(p, "\\-");
 
@@ -1332,6 +1335,7 @@ static int
 termp_bold_pre(DECL_ARGS)
 {
 
+	termp_tag_pre(p, pair, meta, n);
 	term_fontpush(p, TERMFONT_BOLD);
 	return(1);
 }
@@ -1362,7 +1366,7 @@ termp_sh_pre(DECL_ARGS)
 		 * when the previous section was empty.
 		 */
 		if (n->prev == NULL ||
-		    MDOC_Sh != n->prev->tok ||
+		    n->prev->tok != MDOC_Sh ||
 		    (n->prev->body != NULL &&
 		     n->prev->body->child != NULL))
 			term_vspace(p);
@@ -1372,8 +1376,16 @@ termp_sh_pre(DECL_ARGS)
 		break;
 	case ROFFT_BODY:
 		p->offset = term_len(p, p->defindent);
-		if (SEC_AUTHORS == n->sec)
+		switch (n->sec) {
+		case SEC_DESCRIPTION:
+			fn_prio = 0;
+			break;
+		case SEC_AUTHORS:
 			p->flags &= ~(TERMP_SPLIT|TERMP_NOSPLIT);
+			break;
+		default:
+			break;
+		}
 		break;
 	default:
 		break;
@@ -1469,6 +1481,9 @@ termp_fn_pre(DECL_ARGS)
 	term_word(p, n->string);
 	term_fontpop(p);
 
+	if (n->sec == SEC_DESCRIPTION)
+		tag_put(n->string, ++fn_prio, p->line);
+
 	if (pretty) {
 		term_flushln(p);
 		p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG);
@@ -1821,6 +1836,7 @@ termp_sp_pre(DECL_ARGS)
 		break;
 	default:
 		len = 1;
+		fn_prio = 0;
 		break;
 	}
 
@@ -2252,5 +2268,32 @@ termp_under_pre(DECL_ARGS)
 {
 
 	term_fontpush(p, TERMFONT_UNDER);
+	return(1);
+}
+
+static int
+termp_er_pre(DECL_ARGS)
+{
+
+	if (n->sec == SEC_ERRORS &&
+	    (n->parent->tok == MDOC_It ||
+	     (n->parent->tok == MDOC_Bq &&
+	      n->parent->parent->parent->tok == MDOC_It)))
+		tag_put(n->child->string, 1, p->line);
+	return(1);
+}
+
+static int
+termp_tag_pre(DECL_ARGS)
+{
+
+	if (n->child != NULL &&
+	    n->child->type == ROFFT_TEXT &&
+	    n->prev == NULL &&
+	    (n->parent->tok == MDOC_It ||
+	     (n->parent->tok == MDOC_Xo &&
+	      n->parent->parent->prev == NULL &&
+	      n->parent->parent->parent->tok == MDOC_It)))
+		tag_put(n->child->string, 1, p->line);
 	return(1);
 }