===================================================================
RCS file: /cvs/mandoc/mdoc_man.c,v
retrieving revision 1.102
retrieving revision 1.106
diff -u -p -r1.102 -r1.106
--- mandoc/mdoc_man.c	2017/02/06 03:44:58	1.102
+++ mandoc/mdoc_man.c	2017/04/14 18:25:04	1.106
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_man.c,v 1.102 2017/02/06 03:44:58 schwarze Exp $ */
+/*	$Id: mdoc_man.c,v 1.106 2017/04/14 18:25:04 schwarze Exp $ */
 /*
  * Copyright (c) 2011-2017 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -639,9 +639,6 @@ print_node(DECL_ARGS)
 
 	if (ENDBODY_NOT != n->end)
 		n->body->flags |= NODE_ENDED;
-
-	if (ENDBODY_NOSPACE == n->end)
-		outflags &= ~(MMAN_spc | MMAN_nl);
 }
 
 static int
@@ -718,10 +715,8 @@ static int
 pre__t(DECL_ARGS)
 {
 
-	if (n->parent && MDOC_Rs == n->parent->tok &&
-	    n->parent->norm->Rs.quote_T) {
-		print_word("");
-		putchar('\"');
+	if (n->parent->tok == MDOC_Rs && n->parent->norm->Rs.quote_T) {
+		print_word("\\(lq");
 		outflags &= ~MMAN_spc;
 	} else
 		font_push('I');
@@ -732,11 +727,9 @@ static void
 post__t(DECL_ARGS)
 {
 
-	if (n->parent && MDOC_Rs == n->parent->tok &&
-	    n->parent->norm->Rs.quote_T) {
+	if (n->parent->tok  == MDOC_Rs && n->parent->norm->Rs.quote_T) {
 		outflags &= ~MMAN_spc;
-		print_word("");
-		putchar('\"');
+		print_word("\\(rq");
 	} else
 		font_pop();
 	post_percent(meta, n);
@@ -1481,8 +1474,8 @@ pre_lk(DECL_ARGS)
 			print_word(descr->string);
 			descr = descr->next;
 		}
-		print_word(":");
 		font_pop();
+		print_word(":");
 	}
 
 	font_push('B');