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

[mandoc.git] / html.h

diff --git a/html.h b/html.h
index 2f35b24ac0f3ea8242b7cc5ded951af1c618f11d..d2b3a2124c6d9997b360885f225ecf64d7069f47 100644 (file)
--- a/html.h
+++ b/html.h
@@ -1,6 +1,6 @@
-/*     $Id: html.h,v 1.30 2010/12/15 17:19:41 kristaps Exp $ */
+/*     $Id: html.h,v 1.52 2014/08/13 15:25:22 schwarze 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -45,6 +45,12 @@ enum htmltag {
        TAG_DD,
        TAG_BLOCKQUOTE,
        TAG_P,
        TAG_DD,
        TAG_BLOCKQUOTE,
        TAG_P,

+       TAG_PRE,
+       TAG_B,
+       TAG_I,
+       TAG_CODE,
+       TAG_SMALL,
+       TAG_EM,

        TAG_MAX
 };
 
        TAG_MAX
 };
 


@@ -59,10 +65,10 @@ enum        htmlattr {
        ATTR_CLASS,
        ATTR_STYLE,
        ATTR_WIDTH,
        ATTR_CLASS,
        ATTR_STYLE,
        ATTR_WIDTH,

-       ATTR_VALIGN,
-       ATTR_TARGET,

        ATTR_ID,
        ATTR_SUMMARY,
        ATTR_ID,
        ATTR_SUMMARY,

+       ATTR_ALIGN,
+       ATTR_COLSPAN,

        ATTR_MAX
 };
 
        ATTR_MAX
 };
 


@@ -70,6 +76,7 @@ enum  htmlfont {
        HTMLFONT_NONE = 0,
        HTMLFONT_BOLD,
        HTMLFONT_ITALIC,
        HTMLFONT_NONE = 0,
        HTMLFONT_BOLD,
        HTMLFONT_ITALIC,

+       HTMLFONT_BI,

        HTMLFONT_MAX
 };
 
        HTMLFONT_MAX
 };
 


@@ -106,49 +113,57 @@ enum      htmltype {
 
 struct html {
        int               flags;
 
 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_IGNDELIM    (1 << 1)
 #define        HTML_KEEP        (1 << 2)
 #define        HTML_PREKEEP     (1 << 3)

-#define        HTML_NONOSPACE   (1 << 4)
-       struct tagq       tags;
-       void             *symtab;
-       char             *base;
-       char             *base_man;
-       char             *base_includes;
-       char             *style;
-       char              buf[BUFSIZ];
+#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 */
+       struct tagq       tags; /* stack of open tags */
+       struct rofftbl    tbl; /* current table */
+       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 */
+       char              buf[BUFSIZ]; /* see bufcat and friends */

        size_t            buflen;
        size_t            buflen;

-       struct tag       *metaf;
-       enum htmlfont     metal;
-       enum htmlfont     metac;
-       enum htmltype     type;
+       struct tag       *metaf; /* current open font scope */
+       enum htmlfont     metal; /* last used font */
+       enum htmlfont     metac; /* current font mode */
+       enum htmltype     type; /* output media type */
+       int               oflags; /* output options */
+#define        HTML_FRAGMENT    (1 << 0) /* don't emit HTML/HEAD/BODY */

 };
 
 };
 

-struct roffsu;
-

 void             print_gen_decls(struct html *);
 void             print_gen_head(struct html *);
 void             print_gen_decls(struct html *);
 void             print_gen_head(struct html *);

-struct tag      *print_ofont(struct html *, enum htmlfont);
-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 *);
                                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             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 *, ...);
+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(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 *);
                        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             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
 
 
 __END_DECLS