===================================================================
RCS file: /cvs/mandoc/man_html.c,v
retrieving revision 1.119
retrieving revision 1.121
diff -u -p -r1.119 -r1.121
--- mandoc/man_html.c	2015/10/06 18:32:19	1.119
+++ mandoc/man_html.c	2017/01/10 13:47:00	1.121
@@ -1,4 +1,4 @@
-/*	$Id: man_html.c,v 1.119 2015/10/06 18:32:19 schwarze Exp $ */
+/*	$Id: man_html.c,v 1.121 2017/01/10 13:47:00 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -211,14 +211,14 @@ print_man_node(MAN_ARGS)
 			print_paragraph(h);
 			return;
 		}
-		if (n->flags & MAN_LINE && (*n->string == ' ' ||
+		if (n->flags & NODE_LINE && (*n->string == ' ' ||
 		    (n->prev != NULL && mh->fl & MANH_LITERAL &&
 		     ! (h->flags & HTML_NONEWLINE))))
 			print_otag(h, TAG_BR, 0, NULL);
 		print_text(h, n->string);
 		return;
 	case ROFFT_EQN:
-		if (n->flags & MAN_LINE)
+		if (n->flags & NODE_LINE)
 			putchar('\n');
 		print_eqn(h, n->eqn);
 		break;
@@ -512,7 +512,7 @@ man_IP_pre(MAN_ARGS)
 
 	if (MAN_TP == n->tok) {
 		nn = n->child;
-		while (NULL != nn && 0 == (MAN_LINE & nn->flags))
+		while (NULL != nn && 0 == (NODE_LINE & nn->flags))
 			nn = nn->next;
 		while (NULL != nn) {
 			print_man_node(man, nn, mh, h);
@@ -654,7 +654,7 @@ man_UR_pre(MAN_ARGS)
 
 	n = n->child;
 	assert(n->type == ROFFT_HEAD);
-	if (n->nchild) {
+	if (n->child != NULL) {
 		assert(n->child->type == ROFFT_TEXT);
 		PAIR_CLASS_INIT(&tag[0], "link-ext");
 		PAIR_HREF_INIT(&tag[1], n->child->string);
@@ -662,7 +662,7 @@ man_UR_pre(MAN_ARGS)
 	}
 
 	assert(n->next->type == ROFFT_BODY);
-	if (n->next->nchild)
+	if (n->next->child != NULL)
 		n = n->next;
 
 	print_man_nodelist(man, n->child, mh, h);