===================================================================
RCS file: /cvs/mandoc/eqn_term.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- mandoc/eqn_term.c	2017/08/23 20:03:17	1.14
+++ mandoc/eqn_term.c	2017/08/23 20:29:42	1.15
@@ -1,4 +1,4 @@
-/*	$Id: eqn_term.c,v 1.14 2017/08/23 20:03:17 schwarze Exp $ */
+/*	$Id: eqn_term.c,v 1.15 2017/08/23 20:29:42 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -90,8 +90,14 @@ eqn_box(struct termp *p, const struct eqn_box *bp)
 	if (bp->font != EQNFONT_NONE)
 		term_fontpush(p, fontmap[(int)bp->font]);
 
-	if (bp->text != NULL)
+	if (bp->text != NULL) {
+		if (strchr("!\"'),.:;?]}", *bp->text) != NULL)
+			p->flags |= TERMP_NOSPACE;
 		term_word(p, bp->text);
+		if (*bp->text != '\0' && strchr("\"'([{",
+		    bp->text[strlen(bp->text) - 1]) != NULL)
+			p->flags |= TERMP_NOSPACE;
+	}
 
 	/* Special box types. */