===================================================================
RCS file: /cvs/mandoc/mdoc_term.c,v
retrieving revision 1.355
retrieving revision 1.358
diff -u -p -r1.355 -r1.358
--- mandoc/mdoc_term.c	2017/05/05 15:17:32	1.355
+++ mandoc/mdoc_term.c	2017/05/30 16:31:29	1.358
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.355 2017/05/05 15:17:32 schwarze Exp $ */
+/*	$Id: mdoc_term.c,v 1.358 2017/05/30 16:31:29 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -261,7 +261,9 @@ terminal_mdoc(void *arg, const struct roff_man *mdoc)
 	p = (struct termp *)arg;
 	p->overstep = 0;
 	p->rmargin = p->maxrmargin = p->defrmargin;
-	p->tabwidth = term_len(p, 5);
+	term_tab_set(p, NULL);
+	term_tab_set(p, "T");
+	term_tab_set(p, ".5i");
 
 	n = mdoc->first->child;
 	if (p->synopsisonly) {
@@ -340,7 +342,8 @@ print_mdoc_node(DECL_ARGS)
 
 	switch (n->type) {
 	case ROFFT_TEXT:
-		if (' ' == *n->string && NODE_LINE & n->flags)
+		if (*n->string == ' ' && n->flags & NODE_LINE &&
+		    (p->flags & TERMP_NONEWLINE) == 0)
 			term_newln(p);
 		if (NODE_DELIMC & n->flags)
 			p->flags |= TERMP_NOSPACE;
@@ -1128,8 +1131,14 @@ static void
 termp_bl_post(DECL_ARGS)
 {
 
-	if (n->type == ROFFT_BLOCK)
-		term_newln(p);
+	if (n->type != ROFFT_BLOCK)
+		return;
+	term_newln(p);
+	if (n->tok != MDOC_Bl || n->norm->Bl.type != LIST_column)
+		return;
+	term_tab_set(p, NULL);
+	term_tab_set(p, "T");
+	term_tab_set(p, ".5i");
 }
 
 static int
@@ -1272,6 +1281,9 @@ termp_sh_pre(DECL_ARGS)
 		break;
 	case ROFFT_BODY:
 		p->offset = term_len(p, p->defindent);
+		term_tab_set(p, NULL);
+		term_tab_set(p, "T");
+		term_tab_set(p, ".5i");
 		switch (n->sec) {
 		case SEC_DESCRIPTION:
 			fn_prio = 0;
@@ -1322,6 +1334,9 @@ termp_d1_pre(DECL_ARGS)
 		return 1;
 	term_newln(p);
 	p->offset += term_len(p, p->defindent + 1);
+	term_tab_set(p, NULL);
+	term_tab_set(p, "T");
+	term_tab_set(p, ".5i");
 	return 1;
 }
 
@@ -1427,7 +1442,7 @@ termp_fa_pre(DECL_ARGS)
 static int
 termp_bd_pre(DECL_ARGS)
 {
-	size_t			 tabwidth, lm, len, rm, rmax;
+	size_t			 lm, len, rm, rmax;
 	struct roff_node	*nn;
 	int			 offset;
 
@@ -1467,9 +1482,11 @@ termp_bd_pre(DECL_ARGS)
 	    DISP_centered != n->norm->Bd.type)
 		return 1;
 
-	tabwidth = p->tabwidth;
-	if (DISP_literal == n->norm->Bd.type)
-		p->tabwidth = term_len(p, 8);
+	if (n->norm->Bd.type == DISP_literal) {
+		term_tab_set(p, NULL);
+		term_tab_set(p, "T");
+		term_tab_set(p, "8n");
+	}
 
 	lm = p->offset;
 	rm = p->rmargin;
@@ -1493,9 +1510,9 @@ termp_bd_pre(DECL_ARGS)
 		 * notion of selective eoln whitespace is pretty dumb
 		 * anyway, so don't sweat it.
 		 */
+		if (nn->tok < ROFF_MAX)
+			continue;
 		switch (nn->tok) {
-		case ROFF_br:
-		case ROFF_sp:
 		case MDOC_Sm:
 		case MDOC_Bl:
 		case MDOC_D1:
@@ -1513,7 +1530,6 @@ termp_bd_pre(DECL_ARGS)
 		p->flags |= TERMP_NOSPACE;
 	}
 
-	p->tabwidth = tabwidth;
 	p->rmargin = rm;
 	p->maxrmargin = rmax;
 	return 0;
@@ -1584,6 +1600,9 @@ termp_ss_pre(DECL_ARGS)
 		break;
 	case ROFFT_BODY:
 		p->offset = term_len(p, p->defindent);
+		term_tab_set(p, NULL);
+		term_tab_set(p, "T");
+		term_tab_set(p, ".5i");
 		break;
 	default:
 		break;
@@ -1958,16 +1977,24 @@ termp_li_pre(DECL_ARGS)
 static int
 termp_lk_pre(DECL_ARGS)
 {
-	const struct roff_node *link, *descr;
+	const struct roff_node *link, *descr, *punct;
 	int display;
 
 	if ((link = n->child) == NULL)
 		return 0;
 
+	/* Find beginning of trailing punctuation. */
+	punct = n->last;
+	while (punct != link && punct->flags & NODE_DELIMC)
+		punct = punct->prev;
+	punct = punct->next;
+
 	/* Link text. */
-	if ((descr = link->next) != NULL && !(descr->flags & NODE_DELIMC)) {
+	if ((descr = link->next) != NULL && descr != punct) {
 		term_fontpush(p, TERMFONT_UNDER);
-		while (descr != NULL && !(descr->flags & NODE_DELIMC)) {
+		while (descr != punct) {
+			if (descr->flags & (NODE_DELIMC | NODE_DELIMO))
+				p->flags |= TERMP_NOSPACE;
 			term_word(p, descr->string);
 			descr = descr->next;
 		}
@@ -1987,10 +2014,10 @@ termp_lk_pre(DECL_ARGS)
 	term_fontpop(p);
 
 	/* Trailing punctuation. */
-	while (descr != NULL) {
+	while (punct != NULL) {
 		p->flags |= TERMP_NOSPACE;
-		term_word(p, descr->string);
-		descr = descr->next;
+		term_word(p, punct->string);
+		punct = punct->next;
 	}
 	if (display)
 		term_newln(p);