===================================================================
RCS file: /cvs/mandoc/html.h,v
retrieving revision 1.38
retrieving revision 1.42
diff -u -p -r1.38 -r1.42
--- mandoc/html.h	2011/01/06 11:55:39	1.38
+++ mandoc/html.h	2011/05/14 16:28:23	1.42
@@ -1,4 +1,4 @@
-/*	$Id: html.h,v 1.38 2011/01/06 11:55:39 kristaps Exp $ */
+/*	$Id: html.h,v 1.42 2011/05/14 16:28:23 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -67,6 +67,7 @@ enum	htmlattr {
 	ATTR_ID,
 	ATTR_SUMMARY,
 	ATTR_ALIGN,
+	ATTR_COLSPAN,
 	ATTR_MAX
 };
 
@@ -110,14 +111,16 @@ enum	htmltype {
 
 struct	html {
 	int		  flags;
-#define	HTML_NOSPACE	 (1 << 0)
+#define	HTML_NOSPACE	 (1 << 0) /* suppress next space */
 #define	HTML_IGNDELIM	 (1 << 1)
 #define	HTML_KEEP	 (1 << 2)
 #define	HTML_PREKEEP	 (1 << 3)
-#define	HTML_NONOSPACE	 (1 << 4)
+#define	HTML_NONOSPACE	 (1 << 4) /* never add spaces */
+#define	HTML_LITERAL	 (1 << 5) /* literal (e.g., <PRE>) context */
 	struct tagq	  tags; /* stack of open tags */
 	struct rofftbl	  tbl; /* current table */
-	void		 *symtab; /* character-escapes */
+	struct tag	 *tblt; /* current open table scope */
+	struct mchars	 *symtab; /* character-escapes */
 	char		 *base_man; /* base for manpage href */
 	char		 *base_includes; /* base for include href */
 	char		 *style; /* style-sheet URI */
@@ -136,6 +139,7 @@ struct tag	 *print_otag(struct html *, enum htmltag, 
 void		  print_tagq(struct html *, const struct tag *);
 void		  print_stagq(struct html *, const struct tag *);
 void		  print_text(struct html *, const char *);
+void		  print_tblclose(struct html *);
 void		  print_tbl(struct html *, const struct tbl_span *);
 
 void		  bufcat_su(struct html *, const char *, 
@@ -151,6 +155,7 @@ void		  bufncat(struct html *, const char *, size_t);
 void		  bufinit(struct html *);
 
 void		  html_idcat(char *, const char *, int);
+int		  html_strlen(const char *);
 
 __END_DECLS