===================================================================
RCS file: /cvs/mandoc/html.h,v
retrieving revision 1.15
retrieving revision 1.27
diff -u -p -r1.15 -r1.27
--- mandoc/html.h	2009/10/27 04:50:14	1.15
+++ mandoc/html.h	2010/07/23 00:08:57	1.27
@@ -1,6 +1,6 @@
-/*	$Id: html.h,v 1.15 2009/10/27 04:50:14 kristaps Exp $ */
+/*	$Id: html.h,v 1.27 2010/07/23 00:08:57 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,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
 };
 
@@ -62,6 +60,13 @@ enum	htmlattr {
 	ATTR_MAX
 };
 
+enum	htmlfont {
+	HTMLFONT_NONE = 0,
+	HTMLFONT_BOLD,
+	HTMLFONT_ITALIC,
+	HTMLFONT_MAX
+};
+
 struct	tag {
 	struct tag	 *next;
 	enum htmltag	  tag;
@@ -85,24 +90,30 @@ struct	htmlpair {
 	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)
+#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;
@@ -112,12 +123,17 @@ struct	html {
 	char		 *style;
 	char		  buf[BUFSIZ];
 	size_t		  buflen;
+	struct tag	 *metaf;
+	enum htmlfont	  metal;
+	enum htmlfont	  metac;
+	enum htmltype	  type;
 };
 
 struct	roffsu;
 
-void		  print_gen_doctype(struct html *);
+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 *);
@@ -135,6 +151,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