===================================================================
RCS file: /cvs/mandoc/html.h,v
retrieving revision 1.31
retrieving revision 1.37
diff -u -p -r1.31 -r1.37
--- mandoc/html.h	2010/12/17 10:37:26	1.31
+++ mandoc/html.h	2011/01/04 10:29:41	1.37
@@ -1,4 +1,4 @@
-/*	$Id: html.h,v 1.31 2010/12/17 10:37:26 kristaps Exp $ */
+/*	$Id: html.h,v 1.37 2011/01/04 10:29:41 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -46,6 +46,10 @@ enum	htmltag {
 	TAG_BLOCKQUOTE,
 	TAG_P,
 	TAG_PRE,
+	TAG_B,
+	TAG_I,
+	TAG_CODE,
+	TAG_SMALL,
 	TAG_MAX
 };
 
@@ -60,10 +64,9 @@ enum	htmlattr {
 	ATTR_CLASS,
 	ATTR_STYLE,
 	ATTR_WIDTH,
-	ATTR_VALIGN,
-	ATTR_TARGET,
 	ATTR_ID,
 	ATTR_SUMMARY,
+	ATTR_ALIGN,
 	ATTR_MAX
 };
 
@@ -120,9 +123,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;
 };
 
@@ -130,12 +133,12 @@ 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 *);
 void		  print_stagq(struct html *, const struct tag *);
 void		  print_text(struct html *, const char *);
+void		  print_tbl(struct html *, const struct tbl_span *);
 
 void		  bufcat_su(struct html *, const char *, 
 			const struct roffsu *);