Use <em> for .Em and .Bf -emphasis.

[mandoc.git] / html.h

diff --git a/html.h b/html.h
index 9bb5cb420571ce68b35f6babce35267141d72c36..d2b3a2124c6d9997b360885f225ecf64d7069f47 100644 (file)
--- a/html.h
+++ b/html.h
@@ -1,4 +1,4 @@
-/*     $Id: html.h,v 1.48 2012/05/31 22:29:13 schwarze Exp $ */
+/*     $Id: html.h,v 1.52 2014/08/13 15:25:22 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -50,6 +50,7 @@ enum  htmltag {
        TAG_I,
        TAG_CODE,
        TAG_SMALL,
+       TAG_EM,
        TAG_MAX
 };
 
@@ -75,6 +76,7 @@ enum  htmlfont {
        HTMLFONT_NONE = 0,
        HTMLFONT_BOLD,
        HTMLFONT_ITALIC,
+       HTMLFONT_BI,
        HTMLFONT_MAX
 };
 
@@ -104,7 +106,7 @@ struct      htmlpair {
 #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 { 
+enum   htmltype {
        HTML_HTML_4_01_STRICT,
        HTML_XHTML_1_0_STRICT
 };
@@ -126,7 +128,7 @@ struct      html {
        char             *base_includes; /* base for include href */
        char             *style; /* style-sheet URI */
        char              buf[BUFSIZ]; /* see bufcat and friends */
-       size_t            buflen; 
+       size_t            buflen;
        struct tag       *metaf; /* current open font scope */
        enum htmlfont     metal; /* last used font */
        enum htmlfont     metac; /* current font mode */
@@ -137,7 +139,7 @@ struct      html {
 
 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 *);
@@ -146,15 +148,18 @@ void                print_tblclose(struct html *);
 void             print_tbl(struct html *, const struct tbl_span *);
 void             print_eqn(struct html *, const struct eqn *);
 
+#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_id(struct html *, const char *);
-void             bufcat_style(struct html *, 
+void             bufcat_style(struct html *,
                        const char *, const char *);
-void             bufcat_su(struct html *, const char *, 
+void             bufcat_su(struct html *, const char *,
                        const struct roffsu *);
 void             bufinit(struct html *);
-void             buffmt_man(struct html *, 
+void             buffmt_man(struct html *,
                        const char *, const char *);
 void             buffmt_includes(struct html *, const char *);