===================================================================
RCS file: /cvs/mandoc/mdoc_argv.c,v
retrieving revision 1.46
retrieving revision 1.48
diff -u -p -r1.46 -r1.48
--- mandoc/mdoc_argv.c	2010/05/14 12:55:22	1.46
+++ mandoc/mdoc_argv.c	2010/05/15 08:54:04	1.48
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_argv.c,v 1.46 2010/05/14 12:55:22 kristaps Exp $ */
+/*	$Id: mdoc_argv.c,v 1.48 2010/05/15 08:54:04 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -399,7 +399,7 @@ args(struct mdoc *m, int line, int *pos, 
 	assert(' ' != buf[*pos]);
 
 	if ('\0' == buf[*pos]) {
-		if (ARGS_PPHRASED & fl)
+		if (MDOC_PPHRASE & m->flags)
 			return(ARGS_EOLN);
 		/*
 		 * If we're not in a partial phrase and the flag for
@@ -421,9 +421,10 @@ args(struct mdoc *m, int line, int *pos, 
 	 * we ONLY care about closing delimiters.
 	 */
 
-	if ((fl & ARGS_DELIM) && mdoc_iscdelim(buf[*pos]) > 1) {
+	if ((fl & ARGS_DELIM) && DELIM_CLOSE == mdoc_iscdelim(buf[*pos])) {
 		for (i = *pos; buf[i]; ) {
-			if (mdoc_iscdelim(buf[i]) < 2)
+			enum mdelim d = mdoc_iscdelim(buf[i]);
+			if (DELIM_NONE == d || DELIM_OPEN == d)
 				break;
 			i++;
 			if ('\0' == buf[i] || ' ' != buf[i])
@@ -525,7 +526,7 @@ args(struct mdoc *m, int line, int *pos, 
 		if ( ! (MDOC_PHRASELIT & m->flags))
 			*v = &buf[++(*pos)];
 
-		if (ARGS_PPHRASED & fl)
+		if (MDOC_PPHRASE & m->flags)
 			m->flags |= MDOC_PHRASELIT;
 
 		for ( ; buf[*pos]; (*pos)++) {
@@ -537,7 +538,7 @@ args(struct mdoc *m, int line, int *pos, 
 		}
 
 		if ('\0' == buf[*pos]) {
-			if (ARGS_NOWARN & fl || ARGS_PPHRASED & fl)
+			if (ARGS_NOWARN & fl || MDOC_PPHRASE & m->flags)
 				return(ARGS_QWORD);
 			if ( ! mdoc_pwarn(m, line, *pos, EQUOTTERM))
 				return(ARGS_ERROR);