===================================================================
RCS file: /cvs/mandoc/html.h,v
retrieving revision 1.11
retrieving revision 1.33
diff -u -p -r1.11 -r1.33
--- mandoc/html.h	2009/10/04 09:02:40	1.11
+++ mandoc/html.h	2010/12/20 13:07:55	1.33
@@ -1,6 +1,6 @@
-/*	$Id: html.h,v 1.11 2009/10/04 09:02:40 kristaps Exp $ */
+/*	$Id: html.h,v 1.33 2010/12/20 13:07:55 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -28,19 +28,27 @@ enum	htmltag {
 	TAG_DIV,
 	TAG_H1,
 	TAG_H2,
-	TAG_P,
 	TAG_SPAN,
 	TAG_LINK,
 	TAG_BR,
 	TAG_A,
 	TAG_TABLE,
+	TAG_TBODY,
 	TAG_COL,
 	TAG_TR,
 	TAG_TD,
 	TAG_LI,
 	TAG_UL,
 	TAG_OL,
-	TAG_BASE,
+	TAG_DL,
+	TAG_DT,
+	TAG_DD,
+	TAG_BLOCKQUOTE,
+	TAG_P,
+	TAG_PRE,
+	TAG_B,
+	TAG_I,
+	TAG_U,
 	TAG_MAX
 };
 
@@ -55,38 +63,58 @@ enum	htmlattr {
 	ATTR_CLASS,
 	ATTR_STYLE,
 	ATTR_WIDTH,
-	ATTR_VALIGN,
-	ATTR_TARGET,
 	ATTR_ID,
+	ATTR_SUMMARY,
+	ATTR_ALIGN,
 	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;
-	const void	 *cookie;
-	SLIST_ENTRY(ord)  entry;
+struct tagq {
+	struct tag	 *head;
 };
 
-SLIST_HEAD(tagq, tag);
-SLIST_HEAD(ordq, ord);
-
 struct	htmlpair {
 	enum htmlattr	  key;
-	char		 *val;
+	const char	 *val;
 };
 
+#define	PAIR_INIT(p, t, v) \
+	do { \
+		(p)->key = (t); \
+		(p)->val = (v); \
+	} while (/* CONSTCOND */ 0)
+
+#define	PAIR_ID_INIT(p, v)	PAIR_INIT(p, ATTR_ID, v)
+#define	PAIR_CLASS_INIT(p, v)	PAIR_INIT(p, ATTR_CLASS, v)
+#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)
+#define	PAIR_SUMMARY_INIT(p, v)	PAIR_INIT(p, ATTR_SUMMARY, v)
+
+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)
+#define	HTML_IGNDELIM	 (1 << 1)
+#define	HTML_KEEP	 (1 << 2)
+#define	HTML_PREKEEP	 (1 << 3)
+#define	HTML_NONOSPACE	 (1 << 4)
 	struct tagq	  tags;
-	struct ordq	  ords;
 	void		 *symtab;
 	char		 *base;
 	char		 *base_man;
@@ -94,22 +122,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