Finally get rid of the "overflow: auto" property of ".Bl-tag > dd"

[mandoc.git] / html.h

diff --git a/html.h b/html.h
index c727eacf5d09af9311ad4afa2e9df4ba6506c1fe..07a42a0c3578cc7077b46161fb42c83bc89c960d 100644 (file)
--- a/html.h
+++ b/html.h
@@ -1,7 +1,7 @@
-/*     $Id: html.h,v 1.87 2017/07/08 14:51:04 schwarze Exp $ */
+/* $Id: html.h,v 1.108 2020/04/18 20:40:10 schwarze Exp $ */
 /*
+ * Copyright (c) 2017, 2018, 2019, 2020 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2017 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
@@ -14,24 +14,22 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Internal interfaces for mandoc(1) HTML formatters.
+ * For use by the individual HTML formatters only.
  */
 
 enum   htmltag {
        TAG_HTML,
        TAG_HEAD,
-       TAG_BODY,
        TAG_META,
+       TAG_LINK,
+       TAG_STYLE,
        TAG_TITLE,
+       TAG_BODY,
        TAG_DIV,
-       TAG_H1,
-       TAG_H2,
-       TAG_SPAN,
-       TAG_LINK,
-       TAG_BR,
-       TAG_A,
+       TAG_SECTION,
        TAG_TABLE,
-       TAG_COLGROUP,
-       TAG_COL,
        TAG_TR,
        TAG_TD,
        TAG_LI,
@@ -40,14 +38,20 @@ enum        htmltag {
        TAG_DL,
        TAG_DT,
        TAG_DD,
+       TAG_H1,
+       TAG_H2,
+       TAG_P,
        TAG_PRE,
-       TAG_VAR,
-       TAG_CITE,
+       TAG_A,
        TAG_B,
-       TAG_I,
+       TAG_CITE,
        TAG_CODE,
+       TAG_I,
        TAG_SMALL,
-       TAG_STYLE,
+       TAG_SPAN,
+       TAG_VAR,
+       TAG_BR,
+       TAG_MARK,
        TAG_MATH,
        TAG_MROW,
        TAG_MI,
@@ -68,16 +72,10 @@ enum        htmltag {
        TAG_MAX
 };
 
-enum   htmlfont {
-       HTMLFONT_NONE = 0,
-       HTMLFONT_BOLD,
-       HTMLFONT_ITALIC,
-       HTMLFONT_BI,
-       HTMLFONT_MAX
-};
-
 struct tag {
        struct tag       *next;
+       int               refcnt;
+       int               closed;
        enum htmltag      tag;
 };
 
@@ -88,12 +86,12 @@ struct      html {
 #define        HTML_KEEP        (1 << 2)
 #define        HTML_PREKEEP     (1 << 3)
 #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 */
 #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. */
 #define        HTML_BUFFER      (1 << 10) /* Collect a word to see if it fits. */
+#define        HTML_TOCDONE     (1 << 11) /* The TOC was already written. */
        size_t            indent; /* current output indentation level */
        int               noindent; /* indent disabled by <pre> */
        size_t            col; /* current output byte position */
@@ -102,14 +100,16 @@ struct    html {
        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 */
+       char             *base_man1; /* bases for manpage href */
+       char             *base_man2;
        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 */
 };
 
 
@@ -119,17 +119,23 @@ 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 *, ...);
+struct tag      *print_otag_id(struct html *, enum htmltag, const char *,
+                       struct roff_node *);
 void             print_tagq(struct html *, const struct tag *);
 void             print_stagq(struct html *, const struct tag *);
+void             print_tagged_text(struct html *, const char *,
+                       struct roff_node *);
 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_box *);
-void             print_paragraph(struct html *);
 void             print_endline(struct html *);
 
-char            *html_make_id(const struct roff_node *);
-int              html_strlen(const char *);
+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);