add forgotten mparse options to two rarely used programs

[mandoc.git] / html.h

diff --git a/html.h b/html.h
index ac82683bd2881152f750d884bfeee19100843b77..a6bf89119057632f0bdfbe46caa069f718b44dd4 100644 (file)
--- a/html.h
+++ b/html.h
@@ -1,7 +1,7 @@
-/*     $Id: html.h,v 1.75 2017/01/17 15:32:43 schwarze Exp $ */
+/*     $Id: html.h,v 1.102 2019/03/01 10:57:18 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2017, 2018, 2019 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,8 @@ enum  htmltag {
        TAG_META,
        TAG_TITLE,
        TAG_DIV,
+       TAG_IDIV,
+       TAG_SECTION,
        TAG_H1,
        TAG_H2,
        TAG_SPAN,
@@ -30,8 +32,6 @@ enum  htmltag {
        TAG_BR,
        TAG_A,
        TAG_TABLE,
-       TAG_TBODY,
-       TAG_COL,
        TAG_TR,
        TAG_TD,
        TAG_LI,
@@ -40,8 +40,10 @@ enum htmltag {
        TAG_DL,
        TAG_DT,
        TAG_DD,
-       TAG_BLOCKQUOTE,
+       TAG_P,
        TAG_PRE,
+       TAG_VAR,
+       TAG_CITE,
        TAG_B,
        TAG_I,
        TAG_CODE,
@@ -50,6 +52,7 @@ enum  htmltag {
        TAG_MATH,
        TAG_MROW,
        TAG_MI,
+       TAG_MN,
        TAG_MO,
        TAG_MSUP,
        TAG_MSUB,
@@ -71,18 +74,17 @@ enum        htmlfont {
        HTMLFONT_BOLD,
        HTMLFONT_ITALIC,
        HTMLFONT_BI,
+       HTMLFONT_CW,
        HTMLFONT_MAX
 };
 
 struct tag {
        struct tag       *next;
+       int               refcnt;
+       int               closed;
        enum htmltag      tag;
 };
 
-struct tagq {
-       struct tag       *head;
-};
-
 struct html {
        int               flags;
 #define        HTML_NOSPACE     (1 << 0) /* suppress next space */
@@ -90,15 +92,22 @@ 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. */
-       struct tagq       tags; /* stack of open tags */
+#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 */
+       size_t            bufcol; /* current buf byte position */
+       char              buf[80]; /* output buffer */
+       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 */
@@ -106,21 +115,29 @@ 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 *);
+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 *);
 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_paragraph(struct html *);
+void             print_eqn(struct html *, const struct eqn_box *);
+void             print_endline(struct html *);
 
-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);