===================================================================
RCS file: /cvs/mandoc/html.h,v
retrieving revision 1.42
retrieving revision 1.55
diff -u -p -r1.42 -r1.55
--- mandoc/html.h	2011/05/14 16:28:23	1.42
+++ mandoc/html.h	2014/09/27 08:54:34	1.55
@@ -1,6 +1,6 @@
-/*	$Id: html.h,v 1.42 2011/05/14 16:28:23 kristaps Exp $ */
+/*	$Id: html.h,v 1.55 2014/09/27 08:54:34 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010, 2011 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
@@ -68,6 +68,7 @@ enum	htmlattr {
 	ATTR_SUMMARY,
 	ATTR_ALIGN,
 	ATTR_COLSPAN,
+	ATTR_CHARSET,
 	ATTR_MAX
 };
 
@@ -75,6 +76,7 @@ enum	htmlfont {
 	HTMLFONT_NONE = 0,
 	HTMLFONT_BOLD,
 	HTMLFONT_ITALIC,
+	HTMLFONT_BI,
 	HTMLFONT_MAX
 };
 
@@ -117,6 +119,9 @@ struct	html {
 #define	HTML_PREKEEP	 (1 << 3)
 #define	HTML_NONOSPACE	 (1 << 4) /* never add spaces */
 #define	HTML_LITERAL	 (1 << 5) /* literal (e.g., <PRE>) context */
+#define	HTML_SKIPCHAR	 (1 << 6) /* skip the next character */
+#define	HTML_NOSPLIT	 (1 << 7) /* do not break line before .An */
+#define	HTML_SPLIT	 (1 << 8) /* break line before .An */
 	struct tagq	  tags; /* stack of open tags */
 	struct rofftbl	  tbl; /* current table */
 	struct tag	 *tblt; /* current open table scope */
@@ -129,32 +134,37 @@ struct	html {
 	struct tag	 *metaf; /* current open font scope */
 	enum htmlfont	  metal; /* last used font */
 	enum htmlfont	  metac; /* current font mode */
-	enum htmltype	  type;
+	enum htmltype	  type; /* output media type */
+	int		  oflags; /* output options */
+#define	HTML_FRAGMENT	 (1 << 0) /* don't emit HTML/HEAD/BODY */
 };
 
 void		  print_gen_decls(struct html *);
 void		  print_gen_head(struct html *);
-struct tag	 *print_otag(struct html *, enum htmltag, 
+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		  print_tblclose(struct html *);
 void		  print_tbl(struct html *, const struct tbl_span *);
+void		  print_eqn(struct html *, const struct eqn *);
 
-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 *, ...);
+#if __GNUC__ - 0 >= 4
+__attribute__((__format__ (__printf__, 2, 3)))
+#endif
+void		  bufcat_fmt(struct html *, const char *, ...);
 void		  bufcat(struct html *, const char *);
-void		  bufcat_style(struct html *, 
+void		  bufcat_id(struct html *, const char *);
+void		  bufcat_style(struct html *,
 			const char *, const char *);
-void		  bufncat(struct html *, const char *, size_t);
+void		  bufcat_su(struct html *, const char *,
+			const struct roffsu *);
 void		  bufinit(struct html *);
+void		  buffmt_man(struct html *,
+			const char *, const char *);
+void		  buffmt_includes(struct html *, const char *);
 
-void		  html_idcat(char *, const char *, int);
 int		  html_strlen(const char *);
 
 __END_DECLS