3 files changed, 11 insertions, 13 deletions

diff --git a/html.c b/html.c
index 7a18c976..57316063 100644
--- a/html.c
+++ b/html.c
@@ -91,7 +91,7 @@ extern	int		  getsubopt(char **, char * const *, char **);
 static	void		  print_spec(struct html *, const char *, size_t);
 static	void		  print_res(struct html *, const char *, size_t);
 static	void		  print_ctag(struct html *, enum htmltag);
-static	void		  print_encode(struct html *, const char *);
+static	int		  print_encode(struct html *, const char *);
 
 
 void *
@@ -220,14 +220,16 @@ print_res(struct html *h, const char *p, size_t len)
 }
 
 
-static void
+static int
 print_encode(struct html *h, const char *p)
 {
 	size_t		 sz;
-	int		 len;
+	int		 len, nospace;
 	const char	*seq;
 	enum roffdeco	 deco;
 
+	nospace = 0;
+
 	for (; *p; p++) {
 		sz = strcspn(p, "\\<>&");
 
@@ -264,8 +266,10 @@ print_encode(struct html *h, const char *p)
 		p += len - 1;
 
 		if (DECO_NOSPACE == deco && '\0' == *(p + 1))
-			h->flags |= HTML_NOSPACE;
+			nospace = 1;
 	}
+
+	return(nospace);
 }
 
 
@@ -296,7 +300,7 @@ print_otag(struct html *h, enum htmltag tag,
 	for (i = 0; i < sz; i++) {
 		printf(" %s=\"", htmlattrs[p[i].key]);
 		assert(p->val);
-		print_encode(h, p[i].val);
+		(void)print_encode(h, p[i].val);
 		putchar('\"');
 	}
 	putchar('>');
diff --git a/html.h b/html.h
index 2e77f7f1..add7c12b 100644
--- a/html.h
+++ b/html.h
@@ -112,10 +112,7 @@ struct	html {
 	char		 *style;
 	char		  buf[BUFSIZ];
 	size_t		  buflen;
-	int		  metafont;
-#define	METAF_BOLD	 (1 << 0)
-#define	METAF_UNDER	 (1 << 1)
-	int		  metamask;
+	struct tag	 *metaf;
 };
 
 struct	roffsu;
diff --git a/man_html.c b/man_html.c
index 3864aa91..31c990de 100644
--- a/man_html.c
+++ b/man_html.c
@@ -188,7 +188,7 @@ print_man_node(MAN_ARGS)
 		break;
 	case (MAN_TEXT):
 		print_text(h, n->string);
-		break;
+		return;
 	default:
 		if (mans[n->tok].pre)
 			child = (*mans[n->tok].pre)(m, n, h);
@@ -211,9 +211,6 @@ print_man_node(MAN_ARGS)
 	default:
 		if (mans[n->tok].post)
 			(*mans[n->tok].post)(m, n, h);
-
-		/* Reset metafont upon exit from macro. */
-		h->metafont = 0;
 		break;
 	}
 }