===================================================================
RCS file: /cvs/mandoc/tbl_opts.c,v
retrieving revision 1.13
retrieving revision 1.16
diff -u -p -r1.13 -r1.16
--- mandoc/tbl_opts.c	2014/04/20 16:46:05	1.13
+++ mandoc/tbl_opts.c	2015/01/14 22:44:55	1.16
@@ -1,4 +1,4 @@
-/*	$Id: tbl_opts.c,v 1.13 2014/04/20 16:46:05 schwarze Exp $ */
+/*	$Id: tbl_opts.c,v 1.16 2015/01/14 22:44:55 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -14,10 +14,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
+#include <sys/types.h>
+
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -182,7 +182,7 @@ again:	/*
 	 *
 	 * options	::= option_list [:space:]* [;][\n]
 	 * option_list	::= option option_tail
-	 * option_tail	::= [:space:]+ option_list |
+	 * option_tail	::= [,:space:]+ option_list |
 	 *		::= epsilon
 	 * option	::= [:alpha:]+ args
 	 * args		::= [:space:]* [(] [:alpha:]+ [)]
@@ -213,7 +213,7 @@ again:	/*
 
 	buf[i] = '\0';
 
-	while (isspace((unsigned char)p[*pos]))
+	while (isspace((unsigned char)p[*pos]) || p[*pos] == ',')
 		(*pos)++;
 
 	/*
@@ -252,7 +252,7 @@ again:	/*
 	/* NOTREACHED */
 }
 
-int
+void
 tbl_option(struct tbl_node *tbl, int ln, const char *p)
 {
 	int		 pos;
@@ -265,7 +265,4 @@ tbl_option(struct tbl_node *tbl, int ln, const char *p
 
 	pos = 0;
 	opt(tbl, ln, p, &pos);
-
-	/* Always succeed. */
-	return(1);
 }