In the validators, translate obsolete macro aliases (Lp, Ot, LP, P)

[mandoc.git] / html.h

diff --git a/html.h b/html.h
index c9b4940613750f91d6c23ded437ac34687c59081..477f50b4a0f0b405fdd9639703ad3997c2907f5b 100644 (file)
--- a/html.h
+++ b/html.h
@@ -1,7 +1,7 @@
-/*     $Id: html.h,v 1.86 2017/06/23 02:32:12 schwarze Exp $ */
+/*     $Id: html.h,v 1.95 2018/10/25 01:32:40 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,8 +31,6 @@ enum  htmltag {
        TAG_BR,
        TAG_A,
        TAG_TABLE,
-       TAG_COLGROUP,
-       TAG_COL,
        TAG_TR,
        TAG_TD,
        TAG_LI,
@@ -73,6 +72,7 @@ enum  htmlfont {
        HTMLFONT_BOLD,
        HTMLFONT_ITALIC,
        HTMLFONT_BI,
+       HTMLFONT_CW,
        HTMLFONT_MAX
 };
 
@@ -94,6 +94,7 @@ struct        html {
 #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,7 +103,8 @@ 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 */
@@ -110,15 +112,17 @@ struct    html {
        enum htmlfont     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 */
 };
 
 
 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 *, ...);
@@ -127,9 +131,8 @@ 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              html_strlen(const char *);
+char            *html_make_id(const struct roff_node *, int);