test inter-column spacing

[mandoc.git] / html.h

diff --git a/html.h b/html.h
index dfcfb53444ffc120878a6461937de0a09582250b..c9b4940613750f91d6c23ded437ac34687c59081 100644 (file)
--- a/html.h
+++ b/html.h
@@ -1,4 +1,4 @@
-/*     $Id: html.h,v 1.74 2017/01/17 01:47:51 schwarze Exp $ */
+/*     $Id: html.h,v 1.86 2017/06/23 02:32:12 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -30,7 +30,7 @@ enum  htmltag {
        TAG_BR,
        TAG_A,
        TAG_TABLE,
-       TAG_TBODY,
+       TAG_COLGROUP,
        TAG_COL,
        TAG_TR,
        TAG_TD,
@@ -40,8 +40,9 @@ enum  htmltag {
        TAG_DL,
        TAG_DT,
        TAG_DD,
-       TAG_BLOCKQUOTE,
        TAG_PRE,
+       TAG_VAR,
+       TAG_CITE,
        TAG_B,
        TAG_I,
        TAG_CODE,
@@ -50,6 +51,7 @@ enum  htmltag {
        TAG_MATH,
        TAG_MROW,
        TAG_MI,
+       TAG_MN,
        TAG_MO,
        TAG_MSUP,
        TAG_MSUB,
@@ -79,10 +81,6 @@ struct       tag {
        enum htmltag      tag;
 };
 
-struct tagq {
-       struct tag       *head;
-};
-
 struct html {
        int               flags;
 #define        HTML_NOSPACE     (1 << 0) /* suppress next space */
@@ -95,14 +93,18 @@ struct      html {
 #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. */
+       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_includes; /* base for include href */
        char             *style; /* style-sheet URI */
-       char              buf[BUFSIZ]; /* see bufcat and friends */
-       size_t            buflen;
        struct tag       *metaf; /* current open font scope */
        enum htmlfont     metal; /* last used font */
        enum htmlfont     metac; /* current font mode */
@@ -111,9 +113,12 @@ struct     html {
 };
 
 
+struct roff_node;
 struct tbl_span;
 struct eqn;
 
+void             roff_html_pre(struct html *, const 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 *, ...);
@@ -124,18 +129,7 @@ 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_endline(struct html *);
 
-void             bufcat_fmt(struct html *, const char *, ...)
-                       __attribute__((__format__ (printf, 2, 3)));
-void             bufcat(struct html *, const char *);
-void             bufcat_id(struct html *, const char *);
-void             bufcat_style(struct html *,
-                       const char *, const char *);
-void             bufcat_su(struct html *, const char *,
-                       const struct roffsu *);
-void             bufinit(struct html *);
-void             buffmt_man(struct html *,
-                       const char *, const char *);
-void             buffmt_includes(struct html *, const char *);
-
+char            *html_make_id(const struct roff_node *);
 int              html_strlen(const char *);