===================================================================
RCS file: /cvs/mandoc/roff.c,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -p -r1.231 -r1.232
--- mandoc/roff.c	2014/10/16 01:28:38	1.231
+++ mandoc/roff.c	2014/10/20 02:33:06	1.232
@@ -1,4 +1,4 @@
-/*	$Id: roff.c,v 1.231 2014/10/16 01:28:38 schwarze Exp $ */
+/*	$Id: roff.c,v 1.232 2014/10/20 02:33:06 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -1872,19 +1872,11 @@ roff_eqndelim(struct roff *r, char **bufp, size_t *szp
 	if (cp2 == NULL)
 		return(ROFF_CONT);
 
-	/* Found a delimiter; get rid of surrounding blanks. */
-
-	cp1 = cp2++;
-	while (cp2[0] == ' ')
-		cp2++;
-	while (cp1[-1] == ' ')
-		cp1--;
-	*cp1 = '\0';
-
 	/* Replace the delimiter with an equation macro. */
 
-	*szp = mandoc_asprintf(&cp1, "%s\n.E%s%s", *bufp,
-	    r->eqn == NULL ? "Q\n" : "N\n\\&", cp2) + 1;
+	*cp2++ = '\0';
+	*szp = mandoc_asprintf(&cp1, "%s%s%s", *bufp,
+	    r->eqn == NULL ? "\\&\n.EQ\n" : "\n.EN\n\\&", cp2) + 1;
 	free(*bufp);
 	*bufp = cp1;