===================================================================
RCS file: /cvs/mandoc/mdoc_html.c,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -p -r1.234 -r1.235
--- mandoc/mdoc_html.c	2015/09/26 00:22:07	1.234
+++ mandoc/mdoc_html.c	2015/09/26 00:32:35	1.235
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_html.c,v 1.234 2015/09/26 00:22:07 schwarze Exp $ */
+/*	$Id: mdoc_html.c,v 1.235 2015/09/26 00:32:35 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -641,17 +641,13 @@ mdoc_nm_pre(MDOC_ARGS)
 	int		 len;
 
 	switch (n->type) {
-	case ROFFT_ELEM:
-		PAIR_CLASS_INIT(&tag, "name");
-		print_otag(h, TAG_B, 1, &tag);
-		if (NULL == n->child && meta->name)
-			print_text(h, meta->name);
-		return(1);
 	case ROFFT_HEAD:
 		print_otag(h, TAG_TD, 0, NULL);
+		/* FALLTHROUGH */
+	case ROFFT_ELEM:
 		PAIR_CLASS_INIT(&tag, "name");
 		print_otag(h, TAG_B, 1, &tag);
-		if (NULL == n->child && meta->name)
+		if (n->child == NULL && meta->name != NULL)
 			print_text(h, meta->name);
 		return(1);
 	case ROFFT_BODY:
@@ -669,7 +665,7 @@ mdoc_nm_pre(MDOC_ARGS)
 		if (n->type == ROFFT_TEXT)
 			len += html_strlen(n->string);
 
-	if (0 == len && meta->name)
+	if (len == 0 && meta->name != NULL)
 		len = html_strlen(meta->name);
 
 	SCALE_HS_INIT(&su, len);