delete the TAG_IDIV crutch, which is no longer used

[mandoc.git] / html.h

diff --git a/html.h b/html.h
index a6bf89119057632f0bdfbe46caa069f718b44dd4..dc4a19cf250f27fd0bed3fd5de96062253a7addd 100644 (file)
--- a/html.h
+++ b/html.h
@@ -1,4 +1,4 @@
-/*     $Id: html.h,v 1.102 2019/03/01 10:57:18 schwarze Exp $ */
+/*     $Id: html.h,v 1.105 2019/09/01 15:12:19 schwarze Exp $ */

 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2017, 2018, 2019 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2017, 2018, 2019 Ingo Schwarze <schwarze@openbsd.org>


@@ -19,18 +19,13 @@
 enum   htmltag {
        TAG_HTML,
        TAG_HEAD,
 enum   htmltag {
        TAG_HTML,
        TAG_HEAD,

-       TAG_BODY,

        TAG_META,
        TAG_META,

+       TAG_LINK,
+       TAG_STYLE,

        TAG_TITLE,
        TAG_TITLE,

+       TAG_BODY,

        TAG_DIV,
        TAG_DIV,

-       TAG_IDIV,

        TAG_SECTION,
        TAG_SECTION,

-       TAG_H1,
-       TAG_H2,
-       TAG_SPAN,
-       TAG_LINK,
-       TAG_BR,
-       TAG_A,

        TAG_TABLE,
        TAG_TR,
        TAG_TD,
        TAG_TABLE,
        TAG_TR,
        TAG_TD,


@@ -40,15 +35,19 @@ enum        htmltag {
        TAG_DL,
        TAG_DT,
        TAG_DD,
        TAG_DL,
        TAG_DT,
        TAG_DD,

+       TAG_H1,
+       TAG_H2,

        TAG_P,
        TAG_PRE,
        TAG_P,
        TAG_PRE,

-       TAG_VAR,
-       TAG_CITE,
+       TAG_A,

        TAG_B,
        TAG_B,

-       TAG_I,
+       TAG_CITE,

        TAG_CODE,
        TAG_CODE,

+       TAG_I,

        TAG_SMALL,
        TAG_SMALL,

-       TAG_STYLE,
+       TAG_SPAN,
+       TAG_VAR,
+       TAG_BR,

        TAG_MATH,
        TAG_MROW,
        TAG_MI,
        TAG_MATH,
        TAG_MROW,
        TAG_MI,


@@ -69,15 +68,6 @@ enum htmltag {
        TAG_MAX
 };
 
        TAG_MAX
 };
 

-enum   htmlfont {
-       HTMLFONT_NONE = 0,
-       HTMLFONT_BOLD,
-       HTMLFONT_ITALIC,
-       HTMLFONT_BI,
-       HTMLFONT_CW,
-       HTMLFONT_MAX
-};
-

 struct tag {
        struct tag       *next;
        int               refcnt;
 struct tag {
        struct tag       *next;
        int               refcnt;


@@ -111,8 +101,8 @@ struct      html {
        char             *base_includes; /* base for include href */
        char             *style; /* style-sheet URI */
        struct tag       *metaf; /* current open font scope */
        char             *base_includes; /* base for include href */
        char             *style; /* style-sheet URI */
        struct tag       *metaf; /* current open font scope */

-       enum htmlfont     metal; /* last used font */
-       enum htmlfont     metac; /* current font mode */
+       enum mandoc_esc   metal; /* last used font */
+       enum mandoc_esc   metac; /* current font mode */

        int               oflags; /* output options */
 #define        HTML_FRAGMENT    (1 << 0) /* don't emit HTML/HEAD/BODY */
 #define        HTML_TOC         (1 << 1) /* emit a table of contents */
        int               oflags; /* output options */
 #define        HTML_FRAGMENT    (1 << 0) /* don't emit HTML/HEAD/BODY */
 #define        HTML_TOC         (1 << 1) /* emit a table of contents */


@@ -128,7 +118,6 @@ void                  roff_html_pre(struct html *, const struct roff_node *);
 void             print_gen_comment(struct html *, struct roff_node *);
 void             print_gen_decls(struct html *);
 void             print_gen_head(struct html *);
 void             print_gen_comment(struct html *, struct roff_node *);
 void             print_gen_decls(struct html *);
 void             print_gen_head(struct html *);

-void             print_metaf(struct html *, enum mandoc_esc);

 struct tag      *print_otag(struct html *, enum htmltag, const char *, ...);
 void             print_tagq(struct html *, const struct tag *);
 void             print_stagq(struct html *, const struct tag *);
 struct tag      *print_otag(struct html *, enum htmltag, const char *, ...);
 void             print_tagq(struct html *, const struct tag *);
 void             print_stagq(struct html *, const struct tag *);


@@ -141,3 +130,4 @@ void                  print_endline(struct html *);
 void             html_close_paragraph(struct html *);
 enum roff_tok    html_fillmode(struct html *, enum roff_tok);
 char            *html_make_id(const struct roff_node *, int);
 void             html_close_paragraph(struct html *);
 enum roff_tok    html_fillmode(struct html *, enum roff_tok);
 char            *html_make_id(const struct roff_node *, int);

+int              html_setfont(struct html *, enum mandoc_esc);