===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mandocdb.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- src/usr.bin/mandoc/mandocdb.c	2014/04/04 02:31:01	1.85
+++ src/usr.bin/mandoc/mandocdb.c	2014/04/04 15:55:17	1.86
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.85 2014/04/04 02:31:01 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.86 2014/04/04 15:55:17 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -216,7 +216,7 @@
 	{ NULL, TYPE_In },  /* In */
 	{ NULL, TYPE_Li },  /* Li */
 	{ parse_mdoc_Nd, TYPE_Nd },  /* Nd */
-	{ parse_mdoc_Nm, TYPE_Nm },  /* Nm */
+	{ parse_mdoc_Nm, 0 },  /* Nm */
 	{ NULL, 0 },  /* Op */
 	{ NULL, 0 },  /* Ot */
 	{ NULL, TYPE_Pa },  /* Pa */
@@ -1389,7 +1389,7 @@
 				    ('\\' == start[0] && '-' == start[1]))
 					break;
 
-				putkey(mpage, start, TYPE_Nm);
+				putkey(mpage, start, TYPE_NAME | TYPE_Nm);
 
 				if (' ' == byte) {
 					start += sz + 1;
@@ -1403,7 +1403,7 @@
 			}
 
 			if (start == title) {
-				putkey(mpage, start, TYPE_Nm);
+				putkey(mpage, start, TYPE_NAME | TYPE_Nm);
 				free(title);
 				return;
 			}
@@ -1580,8 +1580,11 @@
 parse_mdoc_Nm(struct mpage *mpage, const struct mdoc_node *n)
 {
 
-	return(SEC_NAME == n->sec ||
-	    (SEC_SYNOPSIS == n->sec && MDOC_HEAD == n->type));
+	if (SEC_NAME == n->sec)
+		putmdockey(mpage, n->child, TYPE_NAME | TYPE_Nm);
+	else if (SEC_SYNOPSIS == n->sec && MDOC_HEAD == n->type)
+		putmdockey(mpage, n->child, TYPE_Nm);
+	return(0);
 }
 
 static int