===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/eqn_term.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- src/usr.bin/mandoc/eqn_term.c	2017/07/05 15:03:20	1.6
+++ src/usr.bin/mandoc/eqn_term.c	2017/07/06 00:08:52	1.7
@@ -1,4 +1,4 @@
-/*	$OpenBSD: eqn_term.c,v 1.6 2017/07/05 15:03:20 schwarze Exp $ */
+/*	$OpenBSD: eqn_term.c,v 1.7 2017/07/06 00:08:52 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -111,15 +111,6 @@
 
 	if (bp->font != EQNFONT_NONE)
 		term_fontpop(p);
-	if ((bp->type == EQN_LIST && bp->expectargs > 1) ||
-	    (bp->type == EQN_PILE && (bp->prev || bp->next)) ||
-	    (bp->parent != NULL && bp->parent->pos == EQNPOS_SQRT)) {
-		p->flags |= TERMP_NOSPACE;
-		term_word(p, bp->right != NULL ? bp->right : ")");
-		if (bp->parent->type == EQN_SUBEXPR && bp->next != NULL)
-			p->flags |= TERMP_NOSPACE;
-	}
-
 	if (bp->top != NULL) {
 		p->flags |= TERMP_NOSPACE;
 		term_word(p, bp->top);
@@ -127,5 +118,13 @@
 	if (bp->bottom != NULL) {
 		p->flags |= TERMP_NOSPACE;
 		term_word(p, "_");
+	}
+	if ((bp->type == EQN_LIST && bp->expectargs > 1) ||
+	    (bp->type == EQN_PILE && (bp->prev || bp->next)) ||
+	    (bp->parent != NULL && bp->parent->pos == EQNPOS_SQRT)) {
+		p->flags |= TERMP_NOSPACE;
+		term_word(p, bp->right != NULL ? bp->right : ")");
+		if (bp->parent->type == EQN_SUBEXPR && bp->next != NULL)
+			p->flags |= TERMP_NOSPACE;
 	}
 }