Do not write duplicate id= attributes, they violate HTML syntax.

[mandoc.git] / html.h

diff --git a/html.h b/html.h
index a393ff6212a275181d7643a294baa61aecb72391..1ded39e05024f4aeb5ff23f7c489c660ab41620c 100644 (file)
--- a/html.h
+++ b/html.h
@@ -1,7 +1,7 @@
-/*     $Id: html.h,v 1.79 2017/01/26 18:28:18 schwarze Exp $ */
+/*     $Id: html.h,v 1.90 2018/05/25 20:23:51 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -23,6 +23,7 @@ enum  htmltag {
        TAG_META,
        TAG_TITLE,
        TAG_DIV,
+       TAG_IDIV,
        TAG_H1,
        TAG_H2,
        TAG_SPAN,
@@ -30,7 +31,7 @@ enum  htmltag {
        TAG_BR,
        TAG_A,
        TAG_TABLE,
-       TAG_TBODY,
+       TAG_COLGROUP,
        TAG_COL,
        TAG_TR,
        TAG_TD,
@@ -41,6 +42,8 @@ enum  htmltag {
        TAG_DT,
        TAG_DD,
        TAG_PRE,
+       TAG_VAR,
+       TAG_CITE,
        TAG_B,
        TAG_I,
        TAG_CODE,
@@ -49,6 +52,7 @@ enum  htmltag {
        TAG_MATH,
        TAG_MROW,
        TAG_MI,
+       TAG_MN,
        TAG_MO,
        TAG_MSUP,
        TAG_MSUB,
@@ -78,10 +82,6 @@ struct       tag {
        enum htmltag      tag;
 };
 
-struct tagq {
-       struct tag       *head;
-};
-
 struct html {
        int               flags;
 #define        HTML_NOSPACE     (1 << 0) /* suppress next space */
@@ -100,7 +100,7 @@ struct      html {
        size_t            col; /* current output byte position */
        size_t            bufcol; /* current buf byte position */
        char              buf[80]; /* output buffer */
-       struct tagq       tags; /* stack of open tags */
+       struct tag       *tag; /* last open tag */
        struct rofftbl    tbl; /* current table */
        struct tag       *tblt; /* current open table scope */
        char             *base_man; /* base for manpage href */
@@ -114,9 +114,13 @@ struct     html {
 };
 
 
+struct roff_node;
 struct tbl_span;
-struct eqn;
+struct eqn_box;
+
+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 *);
 struct tag      *print_otag(struct html *, enum htmltag, const char *, ...);
@@ -125,8 +129,9 @@ 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             print_eqn(struct html *, const struct eqn_box *);
 void             print_paragraph(struct html *);
 void             print_endline(struct html *);
 
+char            *html_make_id(const struct roff_node *, int);
 int              html_strlen(const char *);