===================================================================
RCS file: /cvs/mandoc/html.h,v
retrieving revision 1.10
retrieving revision 1.13
diff -u -p -r1.10 -r1.13
--- mandoc/html.h	2009/10/03 16:36:06	1.10
+++ mandoc/html.h	2009/10/13 10:21:24	1.13
@@ -1,4 +1,4 @@
-/*	$Id: html.h,v 1.10 2009/10/03 16:36:06 kristaps Exp $ */
+/*	$Id: html.h,v 1.13 2009/10/13 10:21:24 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -57,6 +57,7 @@ enum	htmlattr {
 	ATTR_WIDTH,
 	ATTR_VALIGN,
 	ATTR_TARGET,
+	ATTR_ID,
 	ATTR_MAX
 };
 
@@ -76,9 +77,19 @@ SLIST_HEAD(ordq, ord);
 
 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)
+
 struct	html {
 	int		  flags;
 #define	HTML_NOSPACE	 (1 << 0)
@@ -95,6 +106,8 @@ struct	html {
 	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, 
@@ -103,10 +116,15 @@ 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 *);