===================================================================
RCS file: /cvs/mandoc/Attic/argv.c,v
retrieving revision 1.33
retrieving revision 1.35
diff -u -p -r1.33 -r1.35
--- mandoc/Attic/argv.c	2009/02/27 09:39:40	1.33
+++ mandoc/Attic/argv.c	2009/03/03 22:28:21	1.35
@@ -1,4 +1,4 @@
-/* $Id: argv.c,v 1.33 2009/02/27 09:39:40 kristaps Exp $ */
+/* $Id: argv.c,v 1.35 2009/03/03 22:28:21 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -251,11 +251,19 @@ mdoc_args(struct mdoc *mdoc, int line, 
 
 		/* LINTED */
 		for (i = 0; i < c; i++) {
-			if (MDOC_Column != n->data.block.argv[i].arg)
-				continue;
-			fl |= ARGS_TABSEP;
-			fl &= ~ARGS_DELIM;
-			break;
+			switch (n->data.block.argv[i].arg) {
+			case (MDOC_Column):
+				fl |= ARGS_TABSEP;
+				fl &= ~ARGS_DELIM;
+				i = c;
+				break;
+			case (MDOC_Diag):
+				fl |= ARGS_QUOTED;
+				i = c;
+				break;
+			default:
+				break;
+			}
 		}
 	}
 
@@ -292,6 +300,10 @@ args(struct mdoc *mdoc, int line, 
 	if ((fl & ARGS_DELIM) && mdoc_iscdelim(buf[*pos])) {
 		for (i = *pos; buf[i]; ) {
 			if ( ! mdoc_iscdelim(buf[i]))
+				break;
+			i++;
+			/* There must be at least one space... */
+			if (0 == buf[i] || ! isspace((int)buf[i]))
 				break;
 			i++;
 			while (buf[i] && isspace((int)buf[i]))