===================================================================
RCS file: /cvs/mandoc/html.h,v
retrieving revision 1.7
retrieving revision 1.15
diff -u -p -r1.7 -r1.15
--- mandoc/html.h	2009/09/24 09:50:31	1.7
+++ mandoc/html.h	2009/10/27 04:50:14	1.15
@@ -1,4 +1,4 @@
-/*	$Id: html.h,v 1.7 2009/09/24 09:50:31 kristaps Exp $ */
+/*	$Id: html.h,v 1.15 2009/10/27 04:50:14 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -56,28 +56,48 @@ enum	htmlattr {
 	ATTR_STYLE,
 	ATTR_WIDTH,
 	ATTR_VALIGN,
+	ATTR_TARGET,
+	ATTR_ID,
+	ATTR_SUMMARY,
 	ATTR_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)
+
 struct	html {
 	int		  flags;
 #define	HTML_NOSPACE	 (1 << 0)
@@ -87,9 +107,15 @@ struct	html {
 	struct ordq	  ords;
 	void		 *symtab;
 	char		 *base;
+	char		 *base_man;
+	char		 *base_includes;
 	char		 *style;
+	char		  buf[BUFSIZ];
+	size_t		  buflen;
 };
 
+struct	roffsu;
+
 void		  print_gen_doctype(struct html *);
 void		  print_gen_head(struct html *);
 struct tag	 *print_otag(struct html *, enum htmltag, 
@@ -97,6 +123,18 @@ struct tag	 *print_otag(struct html *, enum htmltag, 
 void		  print_tagq(struct html *, const struct tag *);
 void		  print_stagq(struct html *, const struct tag *);
 void		  print_text(struct html *, 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 *);
 
 __END_DECLS