Drastically fix -T[x]html's handling of font-escape mode changes (i.e.,

using \fI or \fP).  Now, using these modes will cause a font to be
rendered for each word; furthermore, setting mode within a word will do
the correct thing.

Second, make -man use real font tags (B, I, SMALL) to set its font
instead of using font modes and fix up the pre-macro unsetting of the
current mode.

This fixes how roff.7 wasn't validating (<P> closing out a font mode)
and has been checked against gcc.1 (more will come).  I considered
failure to validate OUR manual to be a show-stopper for the up-coming
release.

1 files changed, 4 insertions, 4 deletions

diff --git a/html.h b/html.h
index 1cc98caf..5072c8b3 100644
--- a/html.h
+++ b/html.h
@@ -50,6 +50,7 @@ enum	htmltag {
 	TAG_I,
 	TAG_U,
 	TAG_CODE,
+	TAG_SMALL,
 	TAG_MAX
 };
 
@@ -123,9 +124,9 @@ struct	html {
 	char		 *style;
 	char		  buf[BUFSIZ];
 	size_t		  buflen;
-	struct tag	 *metaf;
-	enum htmlfont	  metal;
-	enum htmlfont	  metac;
+	struct tag	 *metaf; /* current open font scope */
+	enum htmlfont	  metal; /* last used font */
+	enum htmlfont	  metac; /* current font mode */
 	enum htmltype	  type;
 };
 
@@ -133,7 +134,6 @@ struct	roffsu;
 
 void		  print_gen_decls(struct html *);
 void		  print_gen_head(struct html *);
-struct tag	 *print_ofont(struct html *, enum htmlfont);
 struct tag	 *print_otag(struct html *, enum htmltag, 
 				int, const struct htmlpair *);
 void		  print_tagq(struct html *, const struct tag *);