Simplify the roff(7) .ce and .rj terminal formatter by using the

[mandoc.git] / html.h

diff --git a/html.h b/html.h
index fc722694218896c78e3b657255c13623b26d4be3..4eb0b7b891714f41b6973a3d2659f24ceaf25714 100644 (file)
--- a/html.h
+++ b/html.h
@@ -1,4 +1,4 @@
-/*     $Id: html.h,v 1.89 2018/05/09 00:46:10 schwarze Exp $ */
+/*     $Id: html.h,v 1.97 2018/12/31 11:09:25 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -31,8 +31,6 @@ enum  htmltag {
        TAG_BR,
        TAG_A,
        TAG_TABLE,
-       TAG_COLGROUP,
-       TAG_COL,
        TAG_TR,
        TAG_TD,
        TAG_LI,
@@ -74,6 +72,7 @@ enum  htmlfont {
        HTMLFONT_BOLD,
        HTMLFONT_ITALIC,
        HTMLFONT_BI,
+       HTMLFONT_CW,
        HTMLFONT_MAX
 };
 
@@ -89,12 +88,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 */
@@ -103,7 +102,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 */
@@ -111,6 +111,7 @@ 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 */
 };
 
 
@@ -123,6 +124,7 @@ 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_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 *);
@@ -133,5 +135,4 @@ 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);