===================================================================
RCS file: /cvs/mandoc/man_term.c,v
retrieving revision 1.215
retrieving revision 1.218
diff -u -p -r1.215 -r1.218
--- mandoc/man_term.c	2018/08/18 02:08:27	1.215
+++ mandoc/man_term.c	2018/08/18 14:26:12	1.218
@@ -1,4 +1,4 @@
-/*	$Id: man_term.c,v 1.215 2018/08/18 02:08:27 schwarze Exp $ */
+/*	$Id: man_term.c,v 1.218 2018/08/18 14:26:12 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -117,8 +117,8 @@ static const struct man_term_act man_term_acts[MAN_MAX
 	{ pre_I, NULL, 0 }, /* I */
 	{ pre_alternate, NULL, 0 }, /* IR */
 	{ pre_alternate, NULL, 0 }, /* RI */
-	{ pre_literal, NULL, 0 }, /* nf */
-	{ pre_literal, NULL, 0 }, /* fi */
+	{ pre_literal, NULL, MAN_NOTEXT }, /* nf */
+	{ pre_literal, NULL, MAN_NOTEXT }, /* fi */
 	{ NULL, NULL, 0 }, /* RE */
 	{ pre_RS, post_RS, 0 }, /* RS */
 	{ pre_DT, NULL, 0 }, /* DT */
@@ -346,7 +346,7 @@ pre_OP(DECL_ARGS)
 {
 
 	term_word(p, "[");
-	p->flags |= TERMP_NOSPACE;
+	p->flags |= TERMP_KEEP | TERMP_NOSPACE;
 
 	if (NULL != (n = n->child)) {
 		term_fontrepl(p, TERMFONT_BOLD);
@@ -358,6 +358,7 @@ pre_OP(DECL_ARGS)
 	}
 
 	term_fontrepl(p, TERMFONT_NONE);
+	p->flags &= ~TERMP_KEEP;
 	p->flags |= TERMP_NOSPACE;
 	term_word(p, "]");
 	return 0;
@@ -860,7 +861,8 @@ pre_SY(DECL_ARGS)
 
 	switch (n->type) {
 	case ROFFT_BLOCK:
-		print_bvspace(p, n, mt->pardist);
+		if (n->prev == NULL || n->prev->tok != MAN_SY)
+			print_bvspace(p, n, mt->pardist);
 		return 1;
 	case ROFFT_HEAD:
 	case ROFFT_BODY: