===================================================================
RCS file: /cvs/mandoc/mdoc_argv.c,v
retrieving revision 1.79
retrieving revision 1.82
diff -u -p -r1.79 -r1.82
--- mandoc/mdoc_argv.c	2011/06/18 16:29:38	1.79
+++ mandoc/mdoc_argv.c	2012/03/23 05:50:24	1.82
@@ -1,6 +1,6 @@
-/*	$Id: mdoc_argv.c,v 1.79 2011/06/18 16:29:38 kristaps Exp $ */
+/*	$Id: mdoc_argv.c,v 1.82 2012/03/23 05:50:24 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -21,7 +21,6 @@
 #include <sys/types.h>
 
 #include <assert.h>
-#include <ctype.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -52,16 +51,16 @@ struct	mdocarg {
 	const enum mdocargt *argvs;
 };
 
+static	void		 argn_free(struct mdoc_arg *, int);
 static	enum margserr	 args(struct mdoc *, int, int *, 
 				char *, enum argsflag, char **);
 static	int		 args_checkpunct(const char *, int);
-static	int		 argv_single(struct mdoc *, int, 
+static	int		 argv_multi(struct mdoc *, int, 
 				struct mdoc_argv *, int *, char *);
 static	int		 argv_opt_single(struct mdoc *, int, 
 				struct mdoc_argv *, int *, char *);
-static	int		 argv_multi(struct mdoc *, int, 
+static	int		 argv_single(struct mdoc *, int, 
 				struct mdoc_argv *, int *, char *);
-static	void		 argn_free(struct mdoc_arg *, int);
 
 static	const enum argvflag argvflags[MDOC_ARG_MAX] = {
 	ARGV_NONE,	/* MDOC_Split */
@@ -82,7 +81,7 @@ static	const enum argvflag argvflags[MDOC_ARG_MAX] = {
 	ARGV_NONE,	/* MDOC_Ohang */
 	ARGV_NONE,	/* MDOC_Inset */
 	ARGV_MULTI,	/* MDOC_Column */
-	ARGV_SINGLE,	/* MDOC_Width */
+	ARGV_OPT_SINGLE, /* MDOC_Width */
 	ARGV_NONE,	/* MDOC_Compact */
 	ARGV_NONE,	/* MDOC_Std */
 	ARGV_NONE,	/* MDOC_Filled */
@@ -290,8 +289,8 @@ mdoc_argv(struct mdoc *m, int line, enum mdoct tok,
 		return(ARGV_EOLN);
 	else if (NULL == (ap = mdocargs[tok].argvs))
 		return(ARGV_WORD);
-
-	assert(' ' != buf[*pos]);
+	else if ('-' != buf[*pos])
+		return(ARGV_WORD);
 
 	/* Seek to the first unescaped space. */