===================================================================
RCS file: /cvs/mandoc/html.h,v
retrieving revision 1.10
retrieving revision 1.22
diff -u -p -r1.10 -r1.22
--- mandoc/html.h	2009/10/03 16:36:06	1.10
+++ mandoc/html.h	2010/01/29 14:39:38	1.22
@@ -1,4 +1,4 @@
-/*	$Id: html.h,v 1.10 2009/10/03 16:36:06 kristaps Exp $ */
+/*	$Id: html.h,v 1.22 2010/01/29 14:39:38 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -28,7 +28,6 @@ enum	htmltag {
 	TAG_DIV,
 	TAG_H1,
 	TAG_H2,
-	TAG_P,
 	TAG_SPAN,
 	TAG_LINK,
 	TAG_BR,
@@ -40,7 +39,6 @@ enum	htmltag {
 	TAG_LI,
 	TAG_UL,
 	TAG_OL,
-	TAG_BASE,
 	TAG_MAX
 };
 
@@ -57,32 +55,62 @@ enum	htmlattr {
 	ATTR_WIDTH,
 	ATTR_VALIGN,
 	ATTR_TARGET,
+	ATTR_ID,
+	ATTR_SUMMARY,
 	ATTR_MAX
 };
 
+enum	htmlfont {
+	HTMLFONT_NONE = 0,
+	HTMLFONT_BOLD,
+	HTMLFONT_ITALIC,
+	HTMLFONT_MAX
+};
+
 struct	tag {
+	struct tag	 *next;
 	enum htmltag	  tag;
-	SLIST_ENTRY(tag)  entry;
 };
 
 struct	ord {
-	int		  pos;
+	struct ord	 *next;
 	const void	 *cookie;
-	SLIST_ENTRY(ord)  entry;
+	int		  pos;
 };
 
-SLIST_HEAD(tagq, tag);
-SLIST_HEAD(ordq, ord);
+struct tagq {
+	struct tag	 *head;
+};
+struct ordq {
+	struct ord	 *head;
+};
 
 struct	htmlpair {
 	enum htmlattr	  key;
-	char		 *val;
+	const char	 *val;
 };
 
+#define	PAIR_CLASS_INIT(p, v) \
+	do { (p)->key = ATTR_CLASS; \
+	(p)->val = (v); } while (/* CONSTCOND */ 0)
+#define	PAIR_HREF_INIT(p, v) \
+	do { (p)->key = ATTR_HREF; \
+	(p)->val = (v); } while (/* CONSTCOND */ 0)
+#define	PAIR_STYLE_INIT(p, h) \
+	do { (p)->key = ATTR_STYLE; \
+	(p)->val = (h)->buf; } while (/* CONSTCOND */ 0)
+#define	PAIR_SUMMARY_INIT(p, v) \
+	do { (p)->key = ATTR_SUMMARY; \
+	(p)->val = (v); } while (/* CONSTCOND */ 0)
+
+enum	htmltype {
+	HTML_HTML_4_01_STRICT,
+	HTML_XHTML_1_0_STRICT
+};
+
 struct	html {
 	int		  flags;
 #define	HTML_NOSPACE	 (1 << 0)
-#define	HTML_NEWLINE	 (1 << 1)
 #define	HTML_IGNDELIM	 (1 << 2)
 	struct tagq	  tags;
 	struct ordq	  ords;
@@ -93,22 +121,36 @@ struct	html {
 	char		 *style;
 	char		  buf[BUFSIZ];
 	size_t		  buflen;
+	struct tag	 *metaf;
+	enum htmlfont	  metal;
+	enum htmlfont	  metac;
+	enum htmltype	  type;
 };
 
-void		  print_gen_doctype(struct html *);
+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		  buffmt_man(struct html *, const char *, const char *);
+void		  bufcat_su(struct html *, const char *, 
+			const struct roffsu *);
+void		  buffmt_man(struct html *, 
+			const char *, const char *);
 void		  buffmt_includes(struct html *, const char *);
 void		  buffmt(struct html *, const char *, ...);
 void		  bufcat(struct html *, const char *);
+void		  bufcat_style(struct html *, 
+			const char *, const char *);
 void		  bufncat(struct html *, const char *, size_t);
 void		  bufinit(struct html *);
+
+void		  html_idcat(char *, const char *, int);
 
 __END_DECLS