===================================================================
RCS file: /cvs/mandoc/html.h,v
retrieving revision 1.69
retrieving revision 1.73
diff -u -p -r1.69 -r1.73
--- mandoc/html.h	2014/12/01 08:05:52	1.69
+++ mandoc/html.h	2016/07/19 13:36:13	1.73
@@ -1,4 +1,4 @@
-/*	$Id: html.h,v 1.69 2014/12/01 08:05:52 schwarze Exp $ */
+/*	$Id: html.h,v 1.73 2016/07/19 13:36:13 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -126,10 +126,10 @@ struct	html {
 #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 */
+#define	HTML_NONEWLINE	 (1 << 9) /* No line break in nofill mode. */
 	struct tagq	  tags; /* stack of open tags */
 	struct rofftbl	  tbl; /* current table */
 	struct tag	 *tblt; /* current open table scope */
-	const struct mchars *symtab; /* character table */
 	char		 *base_man; /* base for manpage href */
 	char		 *base_includes; /* base for include href */
 	char		 *style; /* style-sheet URI */
@@ -142,7 +142,6 @@ struct	html {
 #define	HTML_FRAGMENT	 (1 << 0) /* don't emit HTML/HEAD/BODY */
 };
 
-__BEGIN_DECLS
 
 struct	tbl_span;
 struct	eqn;
@@ -159,10 +158,8 @@ void		  print_tbl(struct html *, const struct tbl_span
 void		  print_eqn(struct html *, const struct eqn *);
 void		  print_paragraph(struct html *);
 
-#if __GNUC__ - 0 >= 4
-__attribute__((__format__ (__printf__, 2, 3)))
-#endif
-void		  bufcat_fmt(struct html *, const char *, ...);
+void		  bufcat_fmt(struct html *, const char *, ...)
+			__attribute__((__format__ (printf, 2, 3)));
 void		  bufcat(struct html *, const char *);
 void		  bufcat_id(struct html *, const char *);
 void		  bufcat_style(struct html *,
@@ -175,5 +172,3 @@ void		  buffmt_man(struct html *,
 void		  buffmt_includes(struct html *, const char *);
 
 int		  html_strlen(const char *);
-
-__END_DECLS