===================================================================
RCS file: /cvs/mandoc/eqn.c,v
retrieving revision 1.20
retrieving revision 1.22
diff -u -p -r1.20 -r1.22
--- mandoc/eqn.c	2011/07/21 23:30:39	1.20
+++ mandoc/eqn.c	2011/07/22 00:16:37	1.22
@@ -1,4 +1,4 @@
-/*	$Id: eqn.c,v 1.20 2011/07/21 23:30:39 kristaps Exp $ */
+/*	$Id: eqn.c,v 1.22 2011/07/22 00:16:37 kristaps Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -259,33 +259,30 @@ eqn_box(struct eqn_node *ep, struct eqn_box *last)
 			EQN_MSG(MANDOCERR_EQNSYNT, ep);
 			return(EQN_ERR);
 		}
-		if (EQN_DESCOPE != (c = eqn_eqn(ep, last))) {
-			if (EQN_ERR != c)
-				EQN_MSG(MANDOCERR_EQNSCOPE, ep);
-			return(EQN_ERR);
+
+		while (EQN_DESCOPE == (c = eqn_eqn(ep, last))) {
+			assert(last->last);
+			last->last->pile = (enum eqn_pilet)i;
+			eqn_rewind(ep);
+			start = eqn_nexttok(ep, &sz);
+			assert(start);
+			if (5 != sz || strncmp("above", start, 5))
+				break;
+			last->last->above = 1;
 		}
-		assert(last->last);
-		last->last->pile = (enum eqn_pilet)i;
-		eqn_rewind(ep);
-		start = eqn_nexttok(ep, &sz);
-		assert(start);
-		if (1 == sz && 0 == strncmp("}", start, 1))
-			return(EQN_OK);
-		if (5 != sz || strncmp("above", start, 5)) {
-			EQN_MSG(MANDOCERR_EQNSYNT, ep);
-			return(EQN_ERR);
-		}
-		last->last->above = 1;
-		if (EQN_DESCOPE != (c = eqn_eqn(ep, last))) {
+
+		if (EQN_DESCOPE != c) {
 			if (EQN_ERR != c)
 				EQN_MSG(MANDOCERR_EQNSCOPE, ep);
 			return(EQN_ERR);
 		}
+
 		eqn_rewind(ep);
 		start = eqn_nexttok(ep, &sz);
 		assert(start);
 		if (1 == sz && 0 == strncmp("}", start, 1))
 			return(EQN_OK);
+
 		EQN_MSG(MANDOCERR_EQNBADSCOPE, ep);
 		return(EQN_ERR);
 	}
@@ -456,11 +453,11 @@ eqn_next(struct eqn_node *ep, char quote, size_t *sz, 
 {
 	char		*start, *next;
 	int		 q, diff, lim;
-	size_t		 ssz;
+	size_t		 ssz, dummy;
 	struct eqn_def	*def;
 
 	if (NULL == sz)
-		sz = &ssz;
+		sz = &dummy;
 
 	lim = 0;
 	ep->rew = ep->cur;
@@ -485,14 +482,26 @@ again:
 	}
 
 	start = &ep->data[(int)ep->cur];
-	next = q ? strchr(start, quote) : strchr(start, ' ');
 
+	if ( ! q) {
+		if ('{' == *start || '}' == *start)
+			ssz = 1;
+		else
+			ssz = strcspn(start + 1, " ~\"{}\t") + 1;
+		next = start + (int)ssz;
+		if ('\0' == *next)
+			next = NULL;
+	} else
+		next = strchr(start, quote);
+
 	if (NULL != next) {
 		*sz = (size_t)(next - start);
 		ep->cur += *sz;
 		if (q)
 			ep->cur++;
-		while (' ' == ep->data[(int)ep->cur])
+		while (' ' == ep->data[(int)ep->cur] ||
+				'\t' == ep->data[(int)ep->cur] ||
+				'~' == ep->data[(int)ep->cur])
 			ep->cur++;
 	} else {
 		if (q)