===================================================================
RCS file: /cvs/mandoc/html.h,v
retrieving revision 1.58
retrieving revision 1.63
diff -u -p -r1.58 -r1.63
--- mandoc/html.h	2014/09/27 09:05:57	1.58
+++ mandoc/html.h	2014/09/28 11:33:15	1.63
@@ -1,4 +1,4 @@
-/*	$Id: html.h,v 1.58 2014/09/27 09:05:57 kristaps Exp $ */
+/*	$Id: html.h,v 1.63 2014/09/28 11:33:15 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -44,13 +44,25 @@ enum	htmltag {
 	TAG_DT,
 	TAG_DD,
 	TAG_BLOCKQUOTE,
-	TAG_P,
 	TAG_PRE,
 	TAG_B,
 	TAG_I,
 	TAG_CODE,
 	TAG_SMALL,
 	TAG_STYLE,
+	TAG_MATH,
+	TAG_MROW,
+	TAG_MI,
+	TAG_MO,
+	TAG_MSUP,
+	TAG_MSUB,
+	TAG_MSUBSUP,
+	TAG_MFRAC,
+	TAG_MSQRT,
+	TAG_MFENCED,
+	TAG_MTABLE,
+	TAG_MTR,
+	TAG_MTD,
 	TAG_MAX
 };
 
@@ -62,11 +74,11 @@ enum	htmlattr {
 	ATTR_MEDIA,
 	ATTR_CLASS,
 	ATTR_STYLE,
-	ATTR_WIDTH,
 	ATTR_ID,
-	ATTR_ALIGN,
 	ATTR_COLSPAN,
 	ATTR_CHARSET,
+	ATTR_OPEN,
+	ATTR_CLOSE,
 	ATTR_MAX
 };
 
@@ -103,11 +115,6 @@ struct	htmlpair {
 #define	PAIR_HREF_INIT(p, v)	PAIR_INIT(p, ATTR_HREF, v)
 #define	PAIR_STYLE_INIT(p, h)	PAIR_INIT(p, ATTR_STYLE, (h)->buf)
 
-enum	htmltype {
-	HTML_HTML_4_01_STRICT,
-	HTML_XHTML_1_0_STRICT
-};
-
 struct	html {
 	int		  flags;
 #define	HTML_NOSPACE	 (1 << 0) /* suppress next space */
@@ -131,7 +138,6 @@ struct	html {
 	struct tag	 *metaf; /* current open font scope */
 	enum htmlfont	  metal; /* last used font */
 	enum htmlfont	  metac; /* current font mode */
-	enum htmltype	  type; /* output media type */
 	int		  oflags; /* output options */
 #define	HTML_FRAGMENT	 (1 << 0) /* don't emit HTML/HEAD/BODY */
 };
@@ -146,6 +152,7 @@ void		  print_text(struct html *, const char *);
 void		  print_tblclose(struct html *);
 void		  print_tbl(struct html *, const struct tbl_span *);
 void		  print_eqn(struct html *, const struct eqn *);
+void		  print_paragraph(struct html *);
 
 #if __GNUC__ - 0 >= 4
 __attribute__((__format__ (__printf__, 2, 3)))