===================================================================
RCS file: /cvs/mandoc/html.h,v
retrieving revision 1.26
retrieving revision 1.34
diff -u -p -r1.26 -r1.34
--- mandoc/html.h	2010/07/13 23:53:20	1.26
+++ mandoc/html.h	2010/12/22 11:15:16	1.34
@@ -1,4 +1,4 @@
-/*	$Id: html.h,v 1.26 2010/07/13 23:53:20 schwarze Exp $ */
+/*	$Id: html.h,v 1.34 2010/12/22 11:15:16 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -33,12 +33,23 @@ enum	htmltag {
 	TAG_BR,
 	TAG_A,
 	TAG_TABLE,
+	TAG_TBODY,
 	TAG_COL,
 	TAG_TR,
 	TAG_TD,
 	TAG_LI,
 	TAG_UL,
 	TAG_OL,
+	TAG_DL,
+	TAG_DT,
+	TAG_DD,
+	TAG_BLOCKQUOTE,
+	TAG_P,
+	TAG_PRE,
+	TAG_B,
+	TAG_I,
+	TAG_U,
+	TAG_CODE,
 	TAG_MAX
 };
 
@@ -53,10 +64,9 @@ enum	htmlattr {
 	ATTR_CLASS,
 	ATTR_STYLE,
 	ATTR_WIDTH,
-	ATTR_VALIGN,
-	ATTR_TARGET,
 	ATTR_ID,
 	ATTR_SUMMARY,
+	ATTR_ALIGN,
 	ATTR_MAX
 };
 
@@ -72,18 +82,9 @@ struct	tag {
 	enum htmltag	  tag;
 };
 
-struct	ord {
-	struct ord	 *next;
-	const void	 *cookie;
-	int		  pos;
-};
-
 struct tagq {
 	struct tag	 *head;
 };
-struct ordq {
-	struct ord	 *head;
-};
 
 struct	htmlpair {
 	enum htmlattr	  key;
@@ -113,8 +114,8 @@ struct	html {
 #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;