===================================================================
RCS file: /cvs/mandoc/html.h,v
retrieving revision 1.12
retrieving revision 1.18
diff -u -p -r1.12 -r1.18
--- mandoc/html.h	2009/10/07 12:35:23	1.12
+++ mandoc/html.h	2009/11/10 16:20:22	1.18
@@ -1,4 +1,4 @@
-/*	$Id: html.h,v 1.12 2009/10/07 12:35:23 kristaps Exp $ */
+/*	$Id: html.h,v 1.18 2009/11/10 16:20:22 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -58,26 +58,31 @@ enum	htmlattr {
 	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) \
@@ -89,6 +94,9 @@ struct	htmlpair {
 #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;
@@ -104,6 +112,10 @@ struct	html {
 	char		 *style;
 	char		  buf[BUFSIZ];
 	size_t		  buflen;
+	int		  metafont;
+#define	METAF_BOLD	 (1 << 0)
+#define	METAF_UNDER	 (1 << 1)
+	int		  metamask;
 };
 
 struct	roffsu;
@@ -127,6 +139,8 @@ 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