delete trailing whitespace and space-tab sequences; no code change;

[mandoc.git] / html.h

diff --git a/html.h b/html.h
index 4eb0b7b891714f41b6973a3d2659f24ceaf25714..242a63a8d62446650ed31e64877b657732d132f8 100644 (file)
--- a/html.h
+++ b/html.h
@@ -1,7 +1,7 @@
-/*     $Id: html.h,v 1.97 2018/12/31 11:09:25 schwarze Exp $ */
+/*     $Id: html.h,v 1.103 2019/04/30 15:53:00 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2017, 2018 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
@@ -24,6 +24,7 @@ enum  htmltag {
        TAG_TITLE,
        TAG_DIV,
        TAG_IDIV,
+       TAG_SECTION,
        TAG_H1,
        TAG_H2,
        TAG_SPAN,
@@ -39,6 +40,7 @@ enum  htmltag {
        TAG_DL,
        TAG_DT,
        TAG_DD,
+       TAG_P,
        TAG_PRE,
        TAG_VAR,
        TAG_CITE,
@@ -67,17 +69,10 @@ enum        htmltag {
        TAG_MAX
 };
 
-enum   htmlfont {
-       HTMLFONT_NONE = 0,
-       HTMLFONT_BOLD,
-       HTMLFONT_ITALIC,
-       HTMLFONT_BI,
-       HTMLFONT_CW,
-       HTMLFONT_MAX
-};
-
 struct tag {
        struct tag       *next;
+       int               refcnt;
+       int               closed;
        enum htmltag      tag;
 };
 
@@ -107,8 +102,8 @@ struct      html {
        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 */
@@ -124,7 +119,6 @@ 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 *);
@@ -132,7 +126,9 @@ 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 *);
 
+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);