===================================================================
RCS file: /cvs/mandoc/mandocdb.c,v
retrieving revision 1.108
retrieving revision 1.110
diff -u -p -r1.108 -r1.110
--- mandoc/mandocdb.c	2014/01/18 08:19:18	1.108
+++ mandoc/mandocdb.c	2014/01/18 08:55:17	1.110
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.108 2014/01/18 08:19:18 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.110 2014/01/18 08:55:17 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -1302,6 +1302,15 @@ parse_man(struct mpage *mpage, const struct man_node *
 				byte = start[sz];
 				start[sz] = '\0';
 
+				/*
+				 * Assume a stray trailing comma in the
+				 * name list if a name begins with a dash.
+				 */
+
+				if ('-' == start[0] ||
+				    ('\\' == start[0] && '-' == start[1]))
+					break;
+
 				putkey(mpage, start, TYPE_Nm);
 
 				if (' ' == byte) {
@@ -1914,16 +1923,14 @@ dbopen(int real)
 	      " \"arch\" TEXT NOT NULL,\n"
 	      " \"name\" TEXT NOT NULL,\n"
 	      " \"pageid\" INTEGER NOT NULL REFERENCES mpages(id) "
-		"ON DELETE CASCADE,\n"
-	      " \"id\" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL\n"
+		"ON DELETE CASCADE\n"
 	      ");\n"
 	      "\n"
 	      "CREATE TABLE \"keys\" (\n"
 	      " \"bits\" INTEGER NOT NULL,\n"
 	      " \"key\" TEXT NOT NULL,\n"
 	      " \"pageid\" INTEGER NOT NULL REFERENCES mpages(id) "
-		"ON DELETE CASCADE,\n"
-	      " \"id\" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL\n"
+		"ON DELETE CASCADE\n"
 	      ");\n";
 
 	if (SQLITE_OK != sqlite3_exec(db, sql, NULL, NULL, NULL)) {