Enable generation of the desired delim/basic output with groff(1).

[mandoc.git] / html.c

diff --git a/html.c b/html.c
index 38dc9aaecd74cd35625988d051f7ebbe31f852e5..50fa78ce0cc5b2e30b9cae689dc5f4fe7f964b54 100644 (file)
--- a/html.c
+++ b/html.c
@@ -1,2062 +1,988 @@
-/*     $Id: html.c,v 1.42 2009/09/21 09:32:30 kristaps Exp $ */
+/*     $Id: html.c,v 1.261 2019/09/05 13:35:04 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2011-2015, 2017-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
  * copyright notice and this permission notice appear in all copies.
  *
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES

  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR

  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

+#include "config.h"
+

 #include <sys/types.h>
 #include <sys/types.h>

-#include <sys/queue.h>
+#include <sys/stat.h>

 
 #include <assert.h>
 #include <ctype.h>
 
 #include <assert.h>
 #include <ctype.h>

-#include <err.h>
+#include <stdarg.h>
+#include <stddef.h>

 #include <stdio.h>
 #include <stdio.h>

+#include <stdint.h>

 #include <stdlib.h>
 #include <string.h>
 #include <stdlib.h>
 #include <string.h>

+#include <unistd.h>

 
 

-#include "chars.h"
-#include "mdoc.h"
-#include "man.h"
+#include "mandoc_aux.h"
+#include "mandoc_ohash.h"
+#include "mandoc.h"
+#include "roff.h"

 #include "out.h"
 #include "out.h"

-
-#define        DOCTYPE         "-//W3C//DTD HTML 4.01//EN"
-#define        DTD             "http://www.w3.org/TR/html4/strict.dtd"
-
-#define        INDENT           5
-#define        HALFINDENT       3
-
-enum   htmltag {
-       TAG_HTML,
-       TAG_HEAD,
-       TAG_BODY,
-       TAG_META,
-       TAG_TITLE,
-       TAG_DIV,
-       TAG_H1,
-       TAG_H2,
-       TAG_P,
-       TAG_SPAN,
-       TAG_LINK,
-       TAG_BR,
-       TAG_A,
-       TAG_TABLE,
-       TAG_COL,
-       TAG_TR,
-       TAG_TD,
-       TAG_LI,
-       TAG_UL,
-       TAG_OL,
-       TAG_BASE,
-       TAG_MAX
-};
-
-enum   htmlattr {
-       ATTR_HTTPEQUIV,
-       ATTR_CONTENT,
-       ATTR_NAME,
-       ATTR_REL,
-       ATTR_HREF,
-       ATTR_TYPE,
-       ATTR_MEDIA,
-       ATTR_CLASS,
-       ATTR_STYLE,
-       ATTR_WIDTH,
-       ATTR_VALIGN,
-       ATTR_MAX
-};
+#include "html.h"
+#include "manconf.h"
+#include "main.h"

 
 struct htmldata {
 
 struct htmldata {

-       char             *name;
+       const char       *name;

        int               flags;
        int               flags;

-#define        HTML_CLRLINE     (1 << 0)
-#define        HTML_NOSTACK     (1 << 1)
+#define        HTML_INPHRASE    (1 << 0)  /* Can appear in phrasing context. */
+#define        HTML_TOPHRASE    (1 << 1)  /* Establishes phrasing context. */
+#define        HTML_NOSTACK     (1 << 2)  /* Does not have an end tag. */
+#define        HTML_NLBEFORE    (1 << 3)  /* Output line break before opening. */
+#define        HTML_NLBEGIN     (1 << 4)  /* Output line break after opening. */
+#define        HTML_NLEND       (1 << 5)  /* Output line break before closing. */
+#define        HTML_NLAFTER     (1 << 6)  /* Output line break after closing. */
+#define        HTML_NLAROUND    (HTML_NLBEFORE | HTML_NLAFTER)
+#define        HTML_NLINSIDE    (HTML_NLBEGIN | HTML_NLEND)
+#define        HTML_NLALL       (HTML_NLAROUND | HTML_NLINSIDE)
+#define        HTML_INDENT      (1 << 7)  /* Indent content by two spaces. */
+#define        HTML_NOINDENT    (1 << 8)  /* Exception: never indent content. */

 };
 
 static const struct htmldata htmltags[TAG_MAX] = {
 };
 
 static const struct htmldata htmltags[TAG_MAX] = {

-       {"html",        HTML_CLRLINE}, /* TAG_HTML */
-       {"head",        HTML_CLRLINE}, /* TAG_HEAD */
-       {"body",        HTML_CLRLINE}, /* TAG_BODY */
-       {"meta",        HTML_CLRLINE | HTML_NOSTACK}, /* TAG_META */
-       {"title",       HTML_CLRLINE}, /* TAG_TITLE */
-       {"div",         HTML_CLRLINE}, /* TAG_DIV */
-       {"h1",          0}, /* TAG_H1 */
-       {"h2",          0}, /* TAG_H2 */
-       {"p",           HTML_CLRLINE}, /* TAG_P */
-       {"span",        0}, /* TAG_SPAN */
-       {"link",        HTML_CLRLINE | HTML_NOSTACK}, /* TAG_LINK */
-       {"br",          HTML_CLRLINE | HTML_NOSTACK}, /* TAG_LINK */
-       {"a",           0}, /* TAG_A */
-       {"table",       HTML_CLRLINE}, /* TAG_TABLE */
-       {"col",         HTML_CLRLINE | HTML_NOSTACK}, /* TAG_COL */
-       {"tr",          HTML_CLRLINE}, /* TAG_TR */
-       {"td",          HTML_CLRLINE}, /* TAG_TD */
-       {"li",          HTML_CLRLINE}, /* TAG_LI */
-       {"ul",          HTML_CLRLINE}, /* TAG_UL */
-       {"ol",          HTML_CLRLINE}, /* TAG_OL */
-       {"base",        HTML_CLRLINE | HTML_NOSTACK}, /* TAG_BASE */
-};
-
-static const char       *const htmlattrs[ATTR_MAX] = {
-       "http-equiv",
-       "content",
-       "name",
-       "rel",
-       "href",
-       "type",
-       "media",
-       "class",
-       "style",
-       "width",
-       "valign",
-};
-
-struct htmlpair {
-       enum htmlattr     key;
-       char             *val;
-};
-
-struct tag {
-       enum htmltag      tag;
-       SLIST_ENTRY(tag)  entry;
-};
-
-struct ord {
-       int               pos;
-       const void       *cookie;
-       SLIST_ENTRY(ord)  entry;
-};
-
-SLIST_HEAD(tagq, tag);
-SLIST_HEAD(ordq, ord);
-
-struct html {
-       int               flags;
-#define        HTML_NOSPACE     (1 << 0)
-#define        HTML_NEWLINE     (1 << 1)
-       struct tagq       tags;
-       struct ordq       ords;
-       void             *symtab;
-       char             *base;
-       char             *style;
-};
-
-#define        MDOC_ARGS         const struct mdoc_meta *m, \
-                         const struct mdoc_node *n, \
-                         struct html *h
-#define        MAN_ARGS          const struct man_meta *m, \
-                         const struct man_node *n, \
-                         struct html *h
-struct htmlmdoc {
-       int             (*pre)(MDOC_ARGS);
-       void            (*post)(MDOC_ARGS);
-};
-
-static void              print_gen_doctype(struct html *);
-static void              print_gen_head(struct html *);
-static void              print_mdoc(MDOC_ARGS);
-static void              print_mdoc_head(MDOC_ARGS);
-static void              print_mdoc_node(MDOC_ARGS);
-static void              print_mdoc_nodelist(MDOC_ARGS);
-static void              print_man(MAN_ARGS);
-static void              print_man_head(MAN_ARGS);
-static struct tag       *print_otag(struct html *, enum htmltag, 
-                               int, const struct htmlpair *);
-static void              print_tagq(struct html *, const struct tag *);
-static void              print_stagq(struct html *, const struct tag *);
-static void              print_ctag(struct html *, enum htmltag);
-static void              print_encode(struct html *, const char *);
-static void              print_escape(struct html *, const char **);
-static void              print_text(struct html *, const char *);
-static void              print_res(struct html *, const char *, int);
-static void              print_spec(struct html *, const char *, int);
-
-static void              mdoc_root_post(MDOC_ARGS);
-static int               mdoc_root_pre(MDOC_ARGS);
-static int               mdoc_tbl_pre(MDOC_ARGS, int);
-static int               mdoc_tbl_block_pre(MDOC_ARGS, int, int, int, int);
-static int               mdoc_tbl_body_pre(MDOC_ARGS, int, int);
-static int               mdoc_tbl_head_pre(MDOC_ARGS, int, int);
-
-static int               mdoc_ad_pre(MDOC_ARGS);
-static int               mdoc_an_pre(MDOC_ARGS);
-static void              mdoc_aq_post(MDOC_ARGS);
-static int               mdoc_aq_pre(MDOC_ARGS);
-static int               mdoc_ar_pre(MDOC_ARGS);
-static int               mdoc_bd_pre(MDOC_ARGS);
-static void              mdoc_bl_post(MDOC_ARGS);
-static int               mdoc_bl_pre(MDOC_ARGS);
-static int               mdoc_cd_pre(MDOC_ARGS);
-static int               mdoc_d1_pre(MDOC_ARGS);
-static void              mdoc_dq_post(MDOC_ARGS);
-static int               mdoc_dq_pre(MDOC_ARGS);
-static int               mdoc_dv_pre(MDOC_ARGS);
-static int               mdoc_fa_pre(MDOC_ARGS);
-static int               mdoc_fd_pre(MDOC_ARGS);
-static int               mdoc_fl_pre(MDOC_ARGS);
-static int               mdoc_fn_pre(MDOC_ARGS);
-static int               mdoc_ft_pre(MDOC_ARGS);
-static int               mdoc_em_pre(MDOC_ARGS);
-static int               mdoc_er_pre(MDOC_ARGS);
-static int               mdoc_ev_pre(MDOC_ARGS);
-static int               mdoc_ex_pre(MDOC_ARGS);
-static int               mdoc_it_pre(MDOC_ARGS);
-static int               mdoc_nd_pre(MDOC_ARGS);
-static int               mdoc_nm_pre(MDOC_ARGS);
-static int               mdoc_ns_pre(MDOC_ARGS);
-static void              mdoc_op_post(MDOC_ARGS);
-static int               mdoc_op_pre(MDOC_ARGS);
-static int               mdoc_pa_pre(MDOC_ARGS);
-static int               mdoc_pp_pre(MDOC_ARGS);
-static void              mdoc_pq_post(MDOC_ARGS);
-static int               mdoc_pq_pre(MDOC_ARGS);
-static void              mdoc_qq_post(MDOC_ARGS);
-static int               mdoc_qq_pre(MDOC_ARGS);
-static int               mdoc_sh_pre(MDOC_ARGS);
-static void              mdoc_sq_post(MDOC_ARGS);
-static int               mdoc_sq_pre(MDOC_ARGS);
-static int               mdoc_ss_pre(MDOC_ARGS);
-static int               mdoc_sx_pre(MDOC_ARGS);
-static int               mdoc_vt_pre(MDOC_ARGS);
-static int               mdoc_xr_pre(MDOC_ARGS);
-static int               mdoc_xx_pre(MDOC_ARGS);
-
-#ifdef __linux__
-extern size_t            strlcpy(char *, const char *, size_t);
-extern size_t            strlcat(char *, const char *, size_t);
-#endif
-
-static const struct htmlmdoc mdocs[MDOC_MAX] = {
-       {mdoc_pp_pre, NULL}, /* Ap */
-       {NULL, NULL}, /* Dd */
-       {NULL, NULL}, /* Dt */
-       {NULL, NULL}, /* Os */
-       {mdoc_sh_pre, NULL }, /* Sh */
-       {mdoc_ss_pre, NULL }, /* Ss */ 
-       {mdoc_pp_pre, NULL}, /* Pp */ 
-       {mdoc_d1_pre, NULL}, /* D1 */
-       {mdoc_d1_pre, NULL}, /* Dl */
-       {mdoc_bd_pre, NULL}, /* Bd */
-       {NULL, NULL}, /* Ed */
-       {mdoc_bl_pre, mdoc_bl_post}, /* Bl */
-       {NULL, NULL}, /* El */
-       {mdoc_it_pre, NULL}, /* It */
-       {mdoc_ad_pre, NULL}, /* Ad */ 
-       {mdoc_an_pre, NULL}, /* An */
-       {mdoc_ar_pre, NULL}, /* Ar */
-       {mdoc_cd_pre, NULL}, /* Cd */
-       {mdoc_fl_pre, NULL}, /* Cm */
-       {mdoc_dv_pre, NULL}, /* Dv */ 
-       {mdoc_er_pre, NULL}, /* Er */ 
-       {mdoc_ev_pre, NULL}, /* Ev */ 
-       {mdoc_ex_pre, NULL}, /* Ex */
-       {mdoc_fa_pre, NULL}, /* Fa */ 
-       {mdoc_fd_pre, NULL}, /* Fd */ 
-       {mdoc_fl_pre, NULL}, /* Fl */
-       {mdoc_fn_pre, NULL}, /* Fn */ 
-       {mdoc_ft_pre, NULL}, /* Ft */ 
-       {NULL, NULL}, /* Ic */ 
-       {NULL, NULL}, /* In */ 
-       {NULL, NULL}, /* Li */
-       {mdoc_nd_pre, NULL}, /* Nd */ 
-       {mdoc_nm_pre, NULL}, /* Nm */ 
-       {mdoc_op_pre, mdoc_op_post}, /* Op */
-       {NULL, NULL}, /* Ot */
-       {mdoc_pa_pre, NULL}, /* Pa */
-       {NULL, NULL}, /* Rv */
-       {NULL, NULL}, /* St */ 
-       {NULL, NULL}, /* Va */
-       {mdoc_vt_pre, NULL}, /* Vt */ 
-       {mdoc_xr_pre, NULL}, /* Xr */
-       {NULL, NULL}, /* %A */
-       {NULL, NULL}, /* %B */
-       {NULL, NULL}, /* %D */
-       {NULL, NULL}, /* %I */
-       {NULL, NULL}, /* %J */
-       {NULL, NULL}, /* %N */
-       {NULL, NULL}, /* %O */
-       {NULL, NULL}, /* %P */
-       {NULL, NULL}, /* %R */
-       {NULL, NULL}, /* %T */
-       {NULL, NULL}, /* %V */
-       {NULL, NULL}, /* Ac */
-       {mdoc_aq_pre, mdoc_aq_post}, /* Ao */
-       {mdoc_aq_pre, mdoc_aq_post}, /* Aq */
-       {NULL, NULL}, /* At */
-       {NULL, NULL}, /* Bc */
-       {NULL, NULL}, /* Bf */ 
-       {NULL, NULL}, /* Bo */
-       {NULL, NULL}, /* Bq */
-       {mdoc_xx_pre, NULL}, /* Bsx */
-       {NULL, NULL}, /* Bx */
-       {NULL, NULL}, /* Db */
-       {NULL, NULL}, /* Dc */
-       {NULL, NULL}, /* Do */
-       {mdoc_dq_pre, mdoc_dq_post}, /* Dq */
-       {NULL, NULL}, /* Ec */
-       {NULL, NULL}, /* Ef */
-       {mdoc_em_pre, NULL}, /* Em */ 
-       {NULL, NULL}, /* Eo */
-       {mdoc_xx_pre, NULL}, /* Fx */
-       {NULL, NULL}, /* Ms */
-       {NULL, NULL}, /* No */
-       {mdoc_ns_pre, NULL}, /* Ns */
-       {mdoc_xx_pre, NULL}, /* Nx */
-       {mdoc_xx_pre, NULL}, /* Ox */
-       {NULL, NULL}, /* Pc */
-       {NULL, NULL}, /* Pf */
-       {mdoc_pq_pre, mdoc_pq_post}, /* Po */
-       {mdoc_pq_pre, mdoc_pq_post}, /* Pq */
-       {NULL, NULL}, /* Qc */
-       {NULL, NULL}, /* Ql */
-       {mdoc_qq_pre, mdoc_qq_post}, /* Qo */
-       {mdoc_qq_pre, mdoc_qq_post}, /* Qq */
-       {NULL, NULL}, /* Re */
-       {NULL, NULL}, /* Rs */
-       {NULL, NULL}, /* Sc */
-       {mdoc_sq_pre, mdoc_sq_post}, /* So */
-       {mdoc_sq_pre, mdoc_sq_post}, /* Sq */
-       {NULL, NULL}, /* Sm */
-       {mdoc_sx_pre, NULL}, /* Sx */
-       {NULL, NULL}, /* Sy */
-       {NULL, NULL}, /* Tn */
-       {mdoc_xx_pre, NULL}, /* Ux */
-       {NULL, NULL}, /* Xc */
-       {NULL, NULL}, /* Xo */
-       {NULL, NULL}, /* Fo */ 
-       {NULL, NULL}, /* Fc */ 
-       {NULL, NULL}, /* Oo */
-       {NULL, NULL}, /* Oc */
-       {NULL, NULL}, /* Bk */
-       {NULL, NULL}, /* Ek */
-       {NULL, NULL}, /* Bt */
-       {NULL, NULL}, /* Hf */
-       {NULL, NULL}, /* Fr */
-       {NULL, NULL}, /* Ud */
-       {NULL, NULL}, /* Lb */
-       {NULL, NULL}, /* Lp */ 
-       {NULL, NULL}, /* Lk */ 
-       {NULL, NULL}, /* Mt */ 
-       {NULL, NULL}, /* Brq */ 
-       {NULL, NULL}, /* Bro */ 
-       {NULL, NULL}, /* Brc */ 
-       {NULL, NULL}, /* %C */ 
-       {NULL, NULL}, /* Es */ 
-       {NULL, NULL}, /* En */ 
-       {mdoc_xx_pre, NULL}, /* Dx */ 
-       {NULL, NULL}, /* %Q */ 
-       {NULL, NULL}, /* br */
-       {NULL, NULL}, /* sp */ 
+       {"html",        HTML_NLALL},
+       {"head",        HTML_NLALL | HTML_INDENT},
+       {"meta",        HTML_NOSTACK | HTML_NLALL},
+       {"link",        HTML_NOSTACK | HTML_NLALL},
+       {"style",       HTML_NLALL | HTML_INDENT},
+       {"title",       HTML_NLAROUND},
+       {"body",        HTML_NLALL},
+       {"div",         HTML_NLAROUND},
+       {"section",     HTML_NLALL},
+       {"table",       HTML_NLALL | HTML_INDENT},
+       {"tr",          HTML_NLALL | HTML_INDENT},
+       {"td",          HTML_NLAROUND},
+       {"li",          HTML_NLAROUND | HTML_INDENT},
+       {"ul",          HTML_NLALL | HTML_INDENT},
+       {"ol",          HTML_NLALL | HTML_INDENT},
+       {"dl",          HTML_NLALL | HTML_INDENT},
+       {"dt",          HTML_NLAROUND},
+       {"dd",          HTML_NLAROUND | HTML_INDENT},
+       {"h1",          HTML_TOPHRASE | HTML_NLAROUND},
+       {"h2",          HTML_TOPHRASE | HTML_NLAROUND},
+       {"p",           HTML_TOPHRASE | HTML_NLAROUND | HTML_INDENT},
+       {"pre",         HTML_TOPHRASE | HTML_NLALL | HTML_NOINDENT},
+       {"a",           HTML_INPHRASE | HTML_TOPHRASE},
+       {"b",           HTML_INPHRASE | HTML_TOPHRASE},
+       {"cite",        HTML_INPHRASE | HTML_TOPHRASE},
+       {"code",        HTML_INPHRASE | HTML_TOPHRASE},
+       {"i",           HTML_INPHRASE | HTML_TOPHRASE},
+       {"small",       HTML_INPHRASE | HTML_TOPHRASE},
+       {"span",        HTML_INPHRASE | HTML_TOPHRASE},
+       {"var",         HTML_INPHRASE | HTML_TOPHRASE},
+       {"br",          HTML_INPHRASE | HTML_NOSTACK | HTML_NLALL},
+       {"math",        HTML_INPHRASE | HTML_NLALL | HTML_INDENT},
+       {"mrow",        0},
+       {"mi",          0},
+       {"mn",          0},
+       {"mo",          0},
+       {"msup",        0},
+       {"msub",        0},
+       {"msubsup",     0},
+       {"mfrac",       0},
+       {"msqrt",       0},
+       {"mfenced",     0},
+       {"mtable",      0},
+       {"mtr",         0},
+       {"mtd",         0},
+       {"munderover",  0},
+       {"munder",      0},
+       {"mover",       0},

 };
 
 };
 

-static char              buf[BUFSIZ]; /* XXX */
-
-#define        bufcat(x)         (void)strlcat(buf, (x), BUFSIZ) 
-#define        bufinit()         buf[0] = 0
-#define        buffmt(...)       (void)snprintf(buf, BUFSIZ - 1, __VA_ARGS__)
-
-void
-html_mdoc(void *arg, const struct mdoc *m)
-{
-       struct html     *h;
-       struct tag      *t;
-
-       h = (struct html *)arg;
-
-       print_gen_doctype(h);
-       t = print_otag(h, TAG_HTML, 0, NULL);
-       print_mdoc(mdoc_meta(m), mdoc_node(m), h);
-       print_tagq(h, t);
-
-       printf("\n");
-}
-
+/* Avoid duplicate HTML id= attributes. */
+static struct ohash     id_unique;

 
 

-void
-html_man(void *arg, const struct man *m)
-{
-       struct html     *h;
-       struct tag      *t;
+static void     html_reset_internal(struct html *);
+static void     print_byte(struct html *, char);
+static void     print_endword(struct html *);
+static void     print_indent(struct html *);
+static void     print_word(struct html *, const char *);

 
 

-       h = (struct html *)arg;
-
-       print_gen_doctype(h);
-       t = print_otag(h, TAG_HTML, 0, NULL);
-       print_man(man_meta(m), man_node(m), h);
-       print_tagq(h, t);
-
-       printf("\n");
-}
+static void     print_ctag(struct html *, struct tag *);
+static int      print_escape(struct html *, char);
+static int      print_encode(struct html *, const char *, const char *, int);
+static void     print_href(struct html *, const char *, const char *, int);
+static void     print_metaf(struct html *);

 
 
 void *
 
 
 void *

-html_alloc(void)
+html_alloc(const struct manoutput *outopts)

 {
        struct html     *h;
 
 {
        struct html     *h;
 

-       if (NULL == (h = calloc(1, sizeof(struct html))))
-               return(NULL);
+       h = mandoc_calloc(1, sizeof(struct html));

 
 

-       SLIST_INIT(&h->tags);
-       SLIST_INIT(&h->ords);
+       h->tag = NULL;
+       h->style = outopts->style;
+       if ((h->base_man1 = outopts->man) == NULL)
+               h->base_man2 = NULL;
+       else if ((h->base_man2 = strchr(h->base_man1, ';')) != NULL)
+               *h->base_man2++ = '\0';
+       h->base_includes = outopts->includes;
+       if (outopts->fragment)
+               h->oflags |= HTML_FRAGMENT;
+       if (outopts->toc)
+               h->oflags |= HTML_TOC;

 
 

-       if (NULL == (h->symtab = chars_init(CHARS_HTML))) {
-               free(h);
-               return(NULL);
-       }
+       mandoc_ohash_init(&id_unique, 4, 0);

 
 

-       /* h->base = xxx; */
-       h->style = "style.css"; /* XXX */
-       return(h);
+       return h;

 }
 
 }
 

-
-void
-html_free(void *p)
+static void
+html_reset_internal(struct html *h)

 {
        struct tag      *tag;
 {
        struct tag      *tag;

-       struct ord      *ord;
-       struct html     *h;
-
-       h = (struct html *)p;
-
-       while ( ! SLIST_EMPTY(&h->ords)) {
-               ord = SLIST_FIRST(&h->ords);
-               SLIST_REMOVE_HEAD(&h->ords, entry);
-               free(ord);
-       }
+       char            *cp;
+       unsigned int     slot;

 
 

-       while ( ! SLIST_EMPTY(&h->tags)) {
-               tag = SLIST_FIRST(&h->tags);
-               SLIST_REMOVE_HEAD(&h->tags, entry);
+       while ((tag = h->tag) != NULL) {
+               h->tag = tag->next;

                free(tag);
        }
                free(tag);
        }

-       
-       if (h->symtab)
-               chars_free(h->symtab);
-       free(h);
+       cp = ohash_first(&id_unique, &slot);
+       while (cp != NULL) {
+               free(cp);
+               cp = ohash_next(&id_unique, &slot);
+       }
+       ohash_delete(&id_unique);

 }
 
 }
 

-
-static void
-print_mdoc(MDOC_ARGS)
+void
+html_reset(void *p)

 {
 {

-       struct tag      *t;
-
-       t = print_otag(h, TAG_HEAD, 0, NULL);
-       print_mdoc_head(m, n, h);
-       print_tagq(h, t);
-
-       t = print_otag(h, TAG_BODY, 0, NULL);
-       print_mdoc_nodelist(m, n, h);
-       print_tagq(h, t);
+       html_reset_internal(p);
+       mandoc_ohash_init(&id_unique, 4, 0);

 }
 
 }
 

+void
+html_free(void *p)
+{
+       html_reset_internal(p);
+       free(p);
+}

 
 

-static void
+void

 print_gen_head(struct html *h)
 {
 print_gen_head(struct html *h)
 {

-       struct htmlpair  tag[4];
-
-       tag[0].key = ATTR_HTTPEQUIV;
-       tag[0].val = "Content-Type";
-       tag[1].key = ATTR_CONTENT;
-       tag[1].val = "text/html; charset=utf-8";
-       print_otag(h, TAG_META, 2, tag);
-
-       tag[0].key = ATTR_NAME;
-       tag[0].val = "resource-type";
-       tag[1].key = ATTR_CONTENT;
-       tag[1].val = "document";
-       print_otag(h, TAG_META, 2, tag);
-
-       if (h->style) {
-               tag[0].key = ATTR_REL;
-               tag[0].val = "stylesheet";
-               tag[1].key = ATTR_HREF;
-               tag[1].val = h->style;
-               tag[2].key = ATTR_TYPE;
-               tag[2].val = "text/css";
-               tag[3].key = ATTR_MEDIA;
-               tag[3].val = "all";
-               print_otag(h, TAG_LINK, 4, tag);
-       }
+       struct tag      *t;

 
 

-       if (h->base) {
-               tag[0].key = ATTR_HREF;
-               tag[1].val = h->base;
-               print_otag(h, TAG_BASE, 1, tag);
+       print_otag(h, TAG_META, "?", "charset", "utf-8");
+       if (h->style != NULL) {
+               print_otag(h, TAG_LINK, "?h??", "rel", "stylesheet",
+                   h->style, "type", "text/css", "media", "all");
+               return;

        }
        }

-}
-
-
-/* ARGSUSED */
-static void
-print_mdoc_head(MDOC_ARGS)
-{

 
 

-       print_gen_head(h);
-       print_otag(h, TAG_TITLE, 0, NULL);
-       print_text(h, m->title);
+       /*
+        * Print a minimal embedded style sheet.
+        */
+
+       t = print_otag(h, TAG_STYLE, "");
+       print_text(h, "table.head, table.foot { width: 100%; }");
+       print_endline(h);
+       print_text(h, "td.head-rtitle, td.foot-os { text-align: right; }");
+       print_endline(h);
+       print_text(h, "td.head-vol { text-align: center; }");
+       print_endline(h);
+       print_text(h, ".Nd, .Bf, .Op { display: inline; }");
+       print_endline(h);
+       print_text(h, ".Pa, .Ad { font-style: italic; }");
+       print_endline(h);
+       print_text(h, ".Ms { font-weight: bold; }");
+       print_endline(h);
+       print_text(h, ".Bl-diag ");
+       print_byte(h, '>');
+       print_text(h, " dt { font-weight: bold; }");
+       print_endline(h);
+       print_text(h, "code.Nm, .Fl, .Cm, .Ic, code.In, .Fd, .Fn, .Cd "
+           "{ font-weight: bold; font-family: inherit; }");
+       print_tagq(h, t);

 }
 
 }
 

-
-static void
-print_mdoc_nodelist(MDOC_ARGS)
+int
+html_setfont(struct html *h, enum mandoc_esc font)

 {
 {

-
-       print_mdoc_node(m, n, h);
-       if (n->next)
-               print_mdoc_nodelist(m, n->next, h);
+       switch (font) {
+       case ESCAPE_FONTPREV:
+               font = h->metal;
+               break;
+       case ESCAPE_FONTITALIC:
+       case ESCAPE_FONTBOLD:
+       case ESCAPE_FONTBI:
+       case ESCAPE_FONTCW:
+       case ESCAPE_FONTROMAN:
+               break;
+       case ESCAPE_FONT:
+               font = ESCAPE_FONTROMAN;
+               break;
+       default:
+               return 0;
+       }
+       h->metal = h->metac;
+       h->metac = font;
+       return 1;

 }
 
 }
 

-

 static void
 static void

-print_mdoc_node(MDOC_ARGS)
+print_metaf(struct html *h)

 {
 {

-       int              child;
-       struct tag      *t;
-
-       child = 1;
-       t = SLIST_FIRST(&h->tags);
-
-       bufinit();
-
-       switch (n->type) {
-       case (MDOC_ROOT):
-               child = mdoc_root_pre(m, n, h);
-               break;
-       case (MDOC_TEXT):
-               print_text(h, n->string);
+       if (h->metaf) {
+               print_tagq(h, h->metaf);
+               h->metaf = NULL;
+       }
+       switch (h->metac) {
+       case ESCAPE_FONTITALIC:
+               h->metaf = print_otag(h, TAG_I, "");

                break;
                break;

-       default:
-               if (mdocs[n->tok].pre)
-                       child = (*mdocs[n->tok].pre)(m, n, h);
+       case ESCAPE_FONTBOLD:
+               h->metaf = print_otag(h, TAG_B, "");

                break;
                break;

-       }
-
-       if (child && n->child)
-               print_mdoc_nodelist(m, n->child, h);
-
-       print_stagq(h, t);
-
-       bufinit();
-
-       switch (n->type) {
-       case (MDOC_ROOT):
-               mdoc_root_post(m, n, h);
+       case ESCAPE_FONTBI:
+               h->metaf = print_otag(h, TAG_B, "");
+               print_otag(h, TAG_I, "");

                break;
                break;

-       case (MDOC_TEXT):
+       case ESCAPE_FONTCW:
+               h->metaf = print_otag(h, TAG_SPAN, "c", "Li");

                break;
        default:
                break;
        default:

-               if (mdocs[n->tok].post)
-                       (*mdocs[n->tok].post)(m, n, h);

                break;
        }
 }
 
                break;
        }
 }
 

+void
+html_close_paragraph(struct html *h)
+{
+       struct tag      *this, *next;
+       int              flags;
+
+       this = h->tag;
+       for (;;) {
+               next = this->next;
+               flags = htmltags[this->tag].flags;
+               if (flags & (HTML_INPHRASE | HTML_TOPHRASE))
+                       print_ctag(h, this);
+               if ((flags & HTML_INPHRASE) == 0)
+                       break;
+               this = next;
+       }
+}

 
 

-static void
-print_man(MAN_ARGS)
+/*
+ * ROFF_nf switches to no-fill mode, ROFF_fi to fill mode.
+ * TOKEN_NONE does not switch.  The old mode is returned.
+ */
+enum roff_tok
+html_fillmode(struct html *h, enum roff_tok want)

 {
        struct tag      *t;
 {
        struct tag      *t;

+       enum roff_tok    had;

 
 

-       t = print_otag(h, TAG_HEAD, 0, NULL);
-       print_man_head(m, n, h);
-       print_tagq(h, t);
-
-       t = print_otag(h, TAG_BODY, 0, NULL);
-       /*print_man_body(m, n, h);*/
-       print_tagq(h, t);
-}
-
+       for (t = h->tag; t != NULL; t = t->next)
+               if (t->tag == TAG_PRE)
+                       break;

 
 

-/* ARGSUSED */
-static void
-print_man_head(MAN_ARGS)
-{
+       had = t == NULL ? ROFF_fi : ROFF_nf;

 
 

-       print_gen_head(h);
-       print_otag(h, TAG_TITLE, 0, NULL);
-       print_text(h, m->title);
+       if (want != had) {
+               switch (want) {
+               case ROFF_fi:
+                       print_tagq(h, t);
+                       break;
+               case ROFF_nf:
+                       html_close_paragraph(h);
+                       print_otag(h, TAG_PRE, "");
+                       break;
+               case TOKEN_NONE:
+                       break;
+               default:
+                       abort();
+               }
+       }
+       return had;
+}
+
+char *
+html_make_id(const struct roff_node *n, int unique)
+{
+       const struct roff_node  *nch;
+       char                    *buf, *bufs, *cp;
+       unsigned int             slot;
+       int                      suffix;
+
+       for (nch = n->child; nch != NULL; nch = nch->next)
+               if (nch->type != ROFFT_TEXT)
+                       return NULL;
+
+       buf = NULL;
+       deroff(&buf, n);
+       if (buf == NULL)
+               return NULL;
+
+       /*
+        * In ID attributes, only use ASCII characters that are
+        * permitted in URL-fragment strings according to the
+        * explicit list at:
+        * https://url.spec.whatwg.org/#url-fragment-string
+        */
+
+       for (cp = buf; *cp != '\0'; cp++)
+               if (isalnum((unsigned char)*cp) == 0 &&
+                   strchr("!$&'()*+,-./:;=?@_~", *cp) == NULL)
+                       *cp = '_';
+
+       if (unique == 0)
+               return buf;
+
+       /* Avoid duplicate HTML id= attributes. */
+
+       bufs = NULL;
+       suffix = 1;
+       slot = ohash_qlookup(&id_unique, buf);
+       cp = ohash_find(&id_unique, slot);
+       if (cp != NULL) {
+               while (cp != NULL) {
+                       free(bufs);
+                       if (++suffix > 127) {
+                               free(buf);
+                               return NULL;
+                       }
+                       mandoc_asprintf(&bufs, "%s_%d", buf, suffix);
+                       slot = ohash_qlookup(&id_unique, bufs);
+                       cp = ohash_find(&id_unique, slot);
+               }
+               free(buf);
+               buf = bufs;
+       }
+       ohash_insert(&id_unique, slot, buf);
+       return buf;

 }
 
 }
 

-
-static void
-print_spec(struct html *h, const char *p, int len)
+static int
+print_escape(struct html *h, char c)

 {
 {

-       const char      *rhs;
-       int              i;
-       size_t           sz;

 
 

-       rhs = chars_a2ascii(h->symtab, p, (size_t)len, &sz);
-
-       if (NULL == rhs) 
-               return;
-       for (i = 0; i < (int)sz; i++) 
-               putchar(rhs[i]);
+       switch (c) {
+       case '<':
+               print_word(h, "&lt;");
+               break;
+       case '>':
+               print_word(h, "&gt;");
+               break;
+       case '&':
+               print_word(h, "&amp;");
+               break;
+       case '"':
+               print_word(h, "&quot;");
+               break;
+       case ASCII_NBRSP:
+               print_word(h, "&nbsp;");
+               break;
+       case ASCII_HYPH:
+               print_byte(h, '-');
+               break;
+       case ASCII_BREAK:
+               break;
+       default:
+               return 0;
+       }
+       return 1;

 }
 
 }
 

-
-static void
-print_res(struct html *h, const char *p, int len)
+static int
+print_encode(struct html *h, const char *p, const char *pend, int norecurse)

 {
 {

-       const char      *rhs;
-       int              i;
+       char             numbuf[16];
+       const char      *seq;

        size_t           sz;
        size_t           sz;

+       int              c, len, breakline, nospace;
+       enum mandoc_esc  esc;
+       static const char rejs[10] = { ' ', '\\', '<', '>', '&', '"',
+               ASCII_NBRSP, ASCII_HYPH, ASCII_BREAK, '\0' };

 
 

-       rhs = chars_a2res(h->symtab, p, (size_t)len, &sz);
+       if (pend == NULL)
+               pend = strchr(p, '\0');

 
 

-       if (NULL == rhs)
-               return;
-       for (i = 0; i < (int)sz; i++) 
-               putchar(rhs[i]);
-}
-
-
-static void
-print_escape(struct html *h, const char **p)
-{
-       int              j, type;
-       const char      *wp;
+       breakline = 0;
+       nospace = 0;

 
 

-       wp = *p;
-       type = 1;
+       while (p < pend) {
+               if (HTML_SKIPCHAR & h->flags && '\\' != *p) {
+                       h->flags &= ~HTML_SKIPCHAR;
+                       p++;
+                       continue;
+               }

 
 

-       if (0 == *(++wp)) {
-               *p = wp;
-               return;
-       }
+               for (sz = strcspn(p, rejs); sz-- && p < pend; p++)
+                       print_byte(h, *p);

 
 

-       if ('(' == *wp) {
-               wp++;
-               if (0 == *wp || 0 == *(wp + 1)) {
-                       *p = 0 == *wp ? wp : wp + 1;
-                       return;
+               if (breakline &&
+                   (p >= pend || *p == ' ' || *p == ASCII_NBRSP)) {
+                       print_otag(h, TAG_BR, "");
+                       breakline = 0;
+                       while (p < pend && (*p == ' ' || *p == ASCII_NBRSP))
+                               p++;
+                       continue;

                }
 
                }
 

-               print_spec(h, wp, 2);
-               *p = ++wp;
-               return;
+               if (p >= pend)
+                       break;

 
 

-       } else if ('*' == *wp) {
-               if (0 == *(++wp)) {
-                       *p = wp;
-                       return;
+               if (*p == ' ') {
+                       print_endword(h);
+                       p++;
+                       continue;

                }
 
                }
 

-               switch (*wp) {
-               case ('('):
-                       wp++;
-                       if (0 == *wp || 0 == *(wp + 1)) {
-                               *p = 0 == *wp ? wp : wp + 1;
-                               return;
-                       }
+               if (print_escape(h, *p++))
+                       continue;

 
 

-                       print_res(h, wp, 2);
-                       *p = ++wp;
-                       return;
-               case ('['):
-                       type = 0;
-                       break;
+               esc = mandoc_escape(&p, &seq, &len);
+               switch (esc) {
+               case ESCAPE_FONT:
+               case ESCAPE_FONTPREV:
+               case ESCAPE_FONTBOLD:
+               case ESCAPE_FONTITALIC:
+               case ESCAPE_FONTBI:
+               case ESCAPE_FONTCW:
+               case ESCAPE_FONTROMAN:
+                       if (0 == norecurse) {
+                               h->flags |= HTML_NOSPACE;
+                               if (html_setfont(h, esc))
+                                       print_metaf(h);
+                               h->flags &= ~HTML_NOSPACE;
+                       }
+                       continue;
+               case ESCAPE_SKIPCHAR:
+                       h->flags |= HTML_SKIPCHAR;
+                       continue;
+               case ESCAPE_ERROR:
+                       continue;

                default:
                default:

-                       print_res(h, wp, 1);
-                       *p = wp;
-                       return;
+                       break;

                }
                }

-       
-       } else if ('f' == *wp) {
-               if (0 == *(++wp)) {
-                       *p = wp;
-                       return;
+
+               if (h->flags & HTML_SKIPCHAR) {
+                       h->flags &= ~HTML_SKIPCHAR;
+                       continue;

                }
 
                }
 

-               switch (*wp) {
-               case ('B'):
-                       /* TODO */
+               switch (esc) {
+               case ESCAPE_UNICODE:
+                       /* Skip past "u" header. */
+                       c = mchars_num2uc(seq + 1, len - 1);

                        break;
                        break;

-               case ('I'):
-                       /* TODO */
+               case ESCAPE_NUMBERED:
+                       c = mchars_num2char(seq, len);
+                       if (c < 0)
+                               continue;

                        break;
                        break;

-               case ('P'):
-                       /* FALLTHROUGH */
-               case ('R'):
-                       /* TODO */
+               case ESCAPE_SPECIAL:
+                       c = mchars_spec2cp(seq, len);
+                       if (c <= 0)
+                               continue;

                        break;
                        break;

-               default:
+               case ESCAPE_UNDEF:
+                       c = *seq;
+                       break;
+               case ESCAPE_DEVICE:
+                       print_word(h, "html");
+                       continue;
+               case ESCAPE_BREAK:
+                       breakline = 1;
+                       continue;
+               case ESCAPE_NOSPACE:
+                       if ('\0' == *p)
+                               nospace = 1;
+                       continue;
+               case ESCAPE_OVERSTRIKE:
+                       if (len == 0)
+                               continue;
+                       c = seq[len - 1];

                        break;
                        break;

+               default:
+                       continue;

                }
                }

-
-               *p = wp;
-               return;
-
-       } else if ('[' != *wp) {
-               print_spec(h, wp, 1);
-               *p = wp;
-               return;
+               if ((c < 0x20 && c != 0x09) ||
+                   (c > 0x7E && c < 0xA0))
+                       c = 0xFFFD;
+               if (c > 0x7E) {
+                       (void)snprintf(numbuf, sizeof(numbuf), "&#x%.4X;", c);
+                       print_word(h, numbuf);
+               } else if (print_escape(h, c) == 0)
+                       print_byte(h, c);

        }
 
        }
 

-       wp++;
-       for (j = 0; *wp && ']' != *wp; wp++, j++)
-               /* Loop... */ ;
+       return nospace;
+}

 
 

-       if (0 == *wp) {
-               *p = wp;
-               return;
+static void
+print_href(struct html *h, const char *name, const char *sec, int man)
+{
+       struct stat      sb;
+       const char      *p, *pp;
+       char            *filename;
+
+       if (man) {
+               pp = h->base_man1;
+               if (h->base_man2 != NULL) {
+                       mandoc_asprintf(&filename, "%s.%s", name, sec);
+                       if (stat(filename, &sb) == -1)
+                               pp = h->base_man2;
+                       free(filename);
+               }
+       } else
+               pp = h->base_includes;
+
+       while ((p = strchr(pp, '%')) != NULL) {
+               print_encode(h, pp, p, 1);
+               if (man && p[1] == 'S') {
+                       if (sec == NULL)
+                               print_byte(h, '1');
+                       else
+                               print_encode(h, sec, NULL, 1);
+               } else if ((man && p[1] == 'N') ||
+                   (man == 0 && p[1] == 'I'))
+                       print_encode(h, name, NULL, 1);
+               else
+                       print_encode(h, p, p + 2, 1);
+               pp = p + 2;

        }
        }

-
-       if (type)
-               print_spec(h, wp - j, j);
-       else
-               print_res(h, wp - j, j);
-
-       *p = wp;
+       if (*pp != '\0')
+               print_encode(h, pp, NULL, 1);

 }
 
 }
 

-
-static void
-print_encode(struct html *h, const char *p)
+struct tag *
+print_otag(struct html *h, enum htmltag tag, const char *fmt, ...)

 {
 {

+       va_list          ap;
+       struct tag      *t;
+       const char      *attr;
+       char            *arg1, *arg2;
+       int              style_written, tflags;

 
 

-       for (; *p; p++) {
-               if ('\\' == *p) {
-                       print_escape(h, &p);
-                       continue;
-               }
-               switch (*p) {
-               case ('<'):
-                       printf("&lt;");
-                       break;
-               case ('>'):
-                       printf("&gt;");
-                       break;
-               case ('&'):
-                       printf("&amp;");
-                       break;
-               default:
-                       putchar(*p);
+       tflags = htmltags[tag].flags;
+
+       /* Flow content is not allowed in phrasing context. */
+
+       if ((tflags & HTML_INPHRASE) == 0) {
+               for (t = h->tag; t != NULL; t = t->next) {
+                       if (t->closed)
+                               continue;
+                       assert((htmltags[t->tag].flags & HTML_TOPHRASE) == 0);

                        break;
                }
                        break;
                }

-       }
-}

 
 

+       /*
+        * Always wrap phrasing elements in a paragraph
+        * unless already contained in some flow container;
+        * never put them directly into a section.
+        */

 
 

-static struct tag *
-print_otag(struct html *h, enum htmltag tag, 
-               int sz, const struct htmlpair *p)
-{
-       int              i;
-       struct tag      *t;
+       } else if (tflags & HTML_TOPHRASE && h->tag->tag == TAG_SECTION)
+               print_otag(h, TAG_P, "c", "Pp");
+
+       /* Push this tag onto the stack of open scopes. */

 
 

-       if ( ! (HTML_NOSTACK & htmltags[tag].flags)) {
-               if (NULL == (t = malloc(sizeof(struct tag))))
-                       err(EXIT_FAILURE, "malloc");
+       if ((tflags & HTML_NOSTACK) == 0) {
+               t = mandoc_malloc(sizeof(struct tag));

                t->tag = tag;
                t->tag = tag;

-               SLIST_INSERT_HEAD(&h->tags, t, entry);
+               t->next = h->tag;
+               t->refcnt = 0;
+               t->closed = 0;
+               h->tag = t;

        } else
                t = NULL;
 
        } else
                t = NULL;
 

-       if ( ! (HTML_NOSPACE & h->flags))
-               if ( ! (HTML_CLRLINE & htmltags[tag].flags))
-                       printf(" ");
-
-       printf("<%s", htmltags[tag].name);
-       for (i = 0; i < sz; i++) {
-               printf(" %s=\"", htmlattrs[p[i].key]);
-               assert(p->val);
-               print_encode(h, p[i].val);
-               printf("\"");
+       if (tflags & HTML_NLBEFORE)
+               print_endline(h);
+       if (h->col == 0)
+               print_indent(h);
+       else if ((h->flags & HTML_NOSPACE) == 0) {
+               if (h->flags & HTML_KEEP)
+                       print_word(h, "&#x00A0;");
+               else {
+                       if (h->flags & HTML_PREKEEP)
+                               h->flags |= HTML_KEEP;
+                       print_endword(h);
+               }

        }
        }

-       printf(">");

 
 

-       h->flags |= HTML_NOSPACE;
-       if (HTML_CLRLINE & htmltags[tag].flags)
-               h->flags |= HTML_NEWLINE;
+       if ( ! (h->flags & HTML_NONOSPACE))
+               h->flags &= ~HTML_NOSPACE;

        else
        else

-               h->flags &= ~HTML_NEWLINE;
+               h->flags |= HTML_NOSPACE;

 
 

-       return(t);
-}
+       /* Print out the tag name and attributes. */

 
 

+       print_byte(h, '<');
+       print_word(h, htmltags[tag].name);

 
 

-/* ARGSUSED */
-static void
-print_ctag(struct html *h, enum htmltag tag)
-{
-       
-       printf("</%s>", htmltags[tag].name);
-       if (HTML_CLRLINE & htmltags[tag].flags)
-               h->flags |= HTML_NOSPACE;
-       if (HTML_CLRLINE & htmltags[tag].flags)
-               h->flags |= HTML_NEWLINE;
-       else
-               h->flags &= ~HTML_NEWLINE;
-}
+       va_start(ap, fmt);

 
 

+       while (*fmt != '\0' && *fmt != 's') {

 
 

-/* ARGSUSED */
-static void
-print_gen_doctype(struct html *h)
-{
-       
-       printf("<!DOCTYPE HTML PUBLIC \"%s\" \"%s\">\n", DOCTYPE, DTD);
-}
+               /* Parse attributes and arguments. */

 
 

+               arg1 = va_arg(ap, char *);
+               arg2 = NULL;
+               switch (*fmt++) {
+               case 'c':
+                       attr = "class";
+                       break;
+               case 'h':
+                       attr = "href";
+                       break;
+               case 'i':
+                       attr = "id";
+                       break;
+               case '?':
+                       attr = arg1;
+                       arg1 = va_arg(ap, char *);
+                       break;
+               default:
+                       abort();
+               }
+               if (*fmt == 'M')
+                       arg2 = va_arg(ap, char *);
+               if (arg1 == NULL)
+                       continue;

 
 

-static void
-print_text(struct html *h, const char *p)
-{
+               /* Print the attributes. */

 
 

-       if (*p && 0 == *(p + 1))
-               switch (*p) {
-               case('.'):
-                       /* FALLTHROUGH */
-               case(','):
-                       /* FALLTHROUGH */
-               case(';'):
-                       /* FALLTHROUGH */
-               case(':'):
-                       /* FALLTHROUGH */
-               case('?'):
-                       /* FALLTHROUGH */
-               case('!'):
-                       /* FALLTHROUGH */
-               case(')'):
-                       /* FALLTHROUGH */
-               case(']'):
-                       /* FALLTHROUGH */
-               case('}'):
-                       h->flags |= HTML_NOSPACE;
+               print_byte(h, ' ');
+               print_word(h, attr);
+               print_byte(h, '=');
+               print_byte(h, '"');
+               switch (*fmt) {
+               case 'I':
+                       print_href(h, arg1, NULL, 0);
+                       fmt++;
+                       break;
+               case 'M':
+                       print_href(h, arg1, arg2, 1);
+                       fmt++;
+                       break;
+               case 'R':
+                       print_byte(h, '#');
+                       print_encode(h, arg1, NULL, 1);
+                       fmt++;

                        break;
                default:
                        break;
                default:

+                       print_encode(h, arg1, NULL, 1);

                        break;
                }
                        break;
                }

+               print_byte(h, '"');
+       }
+
+       style_written = 0;
+       while (*fmt++ == 's') {
+               arg1 = va_arg(ap, char *);
+               arg2 = va_arg(ap, char *);
+               if (arg2 == NULL)
+                       continue;
+               print_byte(h, ' ');
+               if (style_written == 0) {
+                       print_word(h, "style=\"");
+                       style_written = 1;
+               }
+               print_word(h, arg1);
+               print_byte(h, ':');
+               print_byte(h, ' ');
+               print_word(h, arg2);
+               print_byte(h, ';');
+       }
+       if (style_written)
+               print_byte(h, '"');

 
 

-       if ( ! (h->flags & HTML_NOSPACE))
-               printf(" ");
+       va_end(ap);

 
 

-       h->flags &= ~HTML_NOSPACE;
-       h->flags &= ~HTML_NEWLINE;
+       /* Accommodate for "well-formed" singleton escaping. */

 
 

-       if (p)
-               print_encode(h, p);
+       if (htmltags[tag].flags & HTML_NOSTACK)
+               print_byte(h, '/');

 
 

-       if (*p && 0 == *(p + 1))
-               switch (*p) {
-               case('('):
-                       /* FALLTHROUGH */
-               case('['):
-                       /* FALLTHROUGH */
-               case('{'):
-                       h->flags |= HTML_NOSPACE;
-                       break;
-               default:
-                       break;
-               }
-}
+       print_byte(h, '>');

 
 

+       if (tflags & HTML_NLBEGIN)
+               print_endline(h);
+       else
+               h->flags |= HTML_NOSPACE;

 
 

-static void
-print_tagq(struct html *h, const struct tag *until)
-{
-       struct tag      *tag;
+       if (tflags & HTML_INDENT)
+               h->indent++;
+       if (tflags & HTML_NOINDENT)
+               h->noindent++;

 
 

-       while ( ! SLIST_EMPTY(&h->tags)) {
-               tag = SLIST_FIRST(&h->tags);
-               print_ctag(h, tag->tag);
-               SLIST_REMOVE_HEAD(&h->tags, entry);
-               free(tag);
-               if (until && tag == until)
-                       return;
-       }
+       return t;

 }
 
 }
 

-

 static void
 static void

-print_stagq(struct html *h, const struct tag *suntil)
-{
-       struct tag      *tag;
-
-       while ( ! SLIST_EMPTY(&h->tags)) {
-               tag = SLIST_FIRST(&h->tags);
-               if (suntil && tag == suntil)
-                       return;
-               print_ctag(h, tag->tag);
-               SLIST_REMOVE_HEAD(&h->tags, entry);
+print_ctag(struct html *h, struct tag *tag)
+{
+       int      tflags;
+
+       if (tag->closed == 0) {
+               tag->closed = 1;
+               if (tag == h->metaf)
+                       h->metaf = NULL;
+               if (tag == h->tblt)
+                       h->tblt = NULL;
+
+               tflags = htmltags[tag->tag].flags;
+               if (tflags & HTML_INDENT)
+                       h->indent--;
+               if (tflags & HTML_NOINDENT)
+                       h->noindent--;
+               if (tflags & HTML_NLEND)
+                       print_endline(h);
+               print_indent(h);
+               print_byte(h, '<');
+               print_byte(h, '/');
+               print_word(h, htmltags[tag->tag].name);
+               print_byte(h, '>');
+               if (tflags & HTML_NLAFTER)
+                       print_endline(h);
+       }
+       if (tag->refcnt == 0) {
+               h->tag = tag->next;

                free(tag);
        }
 }
 
                free(tag);
        }
 }
 

-
-/* ARGSUSED */
-static void
-mdoc_root_post(MDOC_ARGS)
+void
+print_gen_decls(struct html *h)

 {
 {

-       struct tm        tm;
-       struct htmlpair  tag[2];
-       struct tag      *t, *tt;
-       char             b[BUFSIZ];
-
-       (void)localtime_r(&m->date, &tm);
-
-       if (0 == strftime(b, BUFSIZ - 1, "%B %e, %Y", &tm))
-               err(EXIT_FAILURE, "strftime");
-
-       tag[0].key = ATTR_CLASS;
-       tag[0].val = "footer";
-       tag[1].key = ATTR_STYLE;
-       tag[1].val = "width: 100%;";
-       t = print_otag(h, TAG_TABLE, 2, tag);
-       tt = print_otag(h, TAG_TR, 0, NULL);
-
-       tag[0].key = ATTR_STYLE;
-       tag[0].val = "width: 50%;";
-       print_otag(h, TAG_TD, 1, tag);
-       print_text(h, b);
-       print_stagq(h, tt);
-
-       tag[0].key = ATTR_STYLE;
-       tag[0].val = "width: 50%; text-align: right;";
-       print_otag(h, TAG_TD, 1, tag);
-       print_text(h, m->os);
-       print_tagq(h, t);
+       print_word(h, "<!DOCTYPE html>");
+       print_endline(h);

 }
 
 }
 

+void
+print_gen_comment(struct html *h, struct roff_node *n)
+{
+       int      wantblank;
+
+       print_word(h, "<!-- This is an automatically generated file."
+           "  Do not edit.");
+       h->indent = 1;
+       wantblank = 0;
+       while (n != NULL && n->type == ROFFT_COMMENT) {
+               if (strstr(n->string, "-->") == NULL &&
+                   (wantblank || *n->string != '\0')) {
+                       print_endline(h);
+                       print_indent(h);
+                       print_word(h, n->string);
+                       wantblank = *n->string != '\0';
+               }
+               n = n->next;
+       }
+       if (wantblank)
+               print_endline(h);
+       print_word(h, " -->");
+       print_endline(h);
+       h->indent = 0;
+}

 
 

-/* ARGSUSED */
-static int
-mdoc_root_pre(MDOC_ARGS)
+void
+print_text(struct html *h, const char *word)

 {
 {

-       struct htmlpair  tag[2];
-       struct tag      *t, *tt;
-       char             b[BUFSIZ], title[BUFSIZ];
+       /*
+        * Always wrap text in a paragraph unless already contained in
+        * some flow container; never put it directly into a section.
+        */
+
+       if (h->tag->tag == TAG_SECTION)
+               print_otag(h, TAG_P, "c", "Pp");

 
 

-       (void)strlcpy(b, m->vol, BUFSIZ);
+       /* Output whitespace before this text? */

 
 

-       if (m->arch) {
-               (void)strlcat(b, " (", BUFSIZ);
-               (void)strlcat(b, m->arch, BUFSIZ);
-               (void)strlcat(b, ")", BUFSIZ);
+       if (h->col && (h->flags & HTML_NOSPACE) == 0) {
+               if ( ! (HTML_KEEP & h->flags)) {
+                       if (HTML_PREKEEP & h->flags)
+                               h->flags |= HTML_KEEP;
+                       print_endword(h);
+               } else
+                       print_word(h, "&#x00A0;");

        }
 
        }
 

-       (void)snprintf(title, BUFSIZ - 1, 
-                       "%s(%d)", m->title, m->msec);
-
-       tag[0].key = ATTR_CLASS;
-       tag[0].val = "body";
-       t = print_otag(h, TAG_DIV, 1, tag);
-
-       tag[0].key = ATTR_CLASS;
-       tag[0].val = "header";
-       tag[1].key = ATTR_STYLE;
-       tag[1].val = "width: 100%;";
-       print_otag(h, TAG_TABLE, 2, tag);
-       tt = print_otag(h, TAG_TR, 0, NULL);
-
-       tag[0].key = ATTR_STYLE;
-       tag[0].val = "width: 33%;";
-       print_otag(h, TAG_TD, 1, tag);
-       print_text(h, b);
-       print_stagq(h, tt);
-
-       tag[0].key = ATTR_STYLE;
-       tag[0].val = "width: 33%; text-align: center;";
-       print_otag(h, TAG_TD, 1, tag);
-       print_text(h, title);
-       print_stagq(h, tt);
-
-       tag[0].key = ATTR_STYLE;
-       tag[0].val = "width: 33%; text-align: right;";
-       print_otag(h, TAG_TD, 1, tag);
-       print_text(h, b);
-       print_stagq(h, t);
-
-       return(1);
-}
+       /*
+        * Print the text, optionally surrounded by HTML whitespace,
+        * optionally manually switching fonts before and after.
+        */

 
 

+       assert(h->metaf == NULL);
+       print_metaf(h);
+       print_indent(h);
+       if ( ! print_encode(h, word, NULL, 0)) {
+               if ( ! (h->flags & HTML_NONOSPACE))
+                       h->flags &= ~HTML_NOSPACE;
+               h->flags &= ~HTML_NONEWLINE;
+       } else
+               h->flags |= HTML_NOSPACE | HTML_NONEWLINE;

 
 

-/* ARGSUSED */
-static int
-mdoc_sh_pre(MDOC_ARGS)
-{
-       struct htmlpair          tag[2];
-       const struct mdoc_node  *nn;
-
-       if (MDOC_HEAD == n->type) {
-               tag[0].key = ATTR_CLASS;
-               tag[0].val = "sec-head";
-               print_otag(h, TAG_DIV, 1, tag);
-               print_otag(h, TAG_SPAN, 1, tag);
-
-               for (nn = n->child; nn; nn = nn->next) {
-                       bufcat(nn->string);
-                       if (nn->next)
-                               bufcat(" ");
-               }
-               tag[0].key = ATTR_NAME;
-               tag[0].val = buf;
-               print_otag(h, TAG_A, 1, tag);
-               return(1);
-       } else if (MDOC_BLOCK == n->type) {
-               tag[0].key = ATTR_CLASS;
-               tag[0].val = "sec-block";
-
-               if (n->prev && NULL == n->prev->body->child) {
-                       print_otag(h, TAG_DIV, 1, tag);
-                       return(1);
-               }
-
-               bufcat("margin-top: 1em;");
-               if (NULL == n->next)
-                       bufcat("margin-bottom: 1em;");
-
-               tag[1].key = ATTR_STYLE;
-               tag[1].val = buf;
-
-               print_otag(h, TAG_DIV, 2, tag);
-               return(1);
+       if (h->metaf != NULL) {
+               print_tagq(h, h->metaf);
+               h->metaf = NULL;

        }
 
        }
 

-       buffmt("margin-left: %dem;", INDENT);
-       
-       tag[0].key = ATTR_CLASS;
-       tag[0].val = "sec-body";
-       tag[1].key = ATTR_STYLE;
-       tag[1].val = buf;
-
-       print_otag(h, TAG_DIV, 2, tag);
-       return(1);
+       h->flags &= ~HTML_IGNDELIM;

 }
 
 }
 

-
-/* ARGSUSED */
-static int
-mdoc_ss_pre(MDOC_ARGS)
+void
+print_tagq(struct html *h, const struct tag *until)

 {
 {

-       struct htmlpair          tag[2];
-       int                      i;
-       const struct mdoc_node  *nn;
-
-       i = 0;
-
-       if (MDOC_BODY == n->type) {
-               tag[i].key = ATTR_CLASS;
-               tag[i++].val = "ssec-body";
-               if (n->parent->next && n->child) {
-                       bufcat("margin-bottom: 1em;");
-                       tag[i].key = ATTR_STYLE;
-                       tag[i++].val = buf;
-               }
-               print_otag(h, TAG_DIV, i, tag);
-               return(1);
-       } else if (MDOC_BLOCK == n->type) {
-               tag[i].key = ATTR_CLASS;
-               tag[i++].val = "ssec-block";
-               if (n->prev) {
-                       bufcat("margin-top: 1em;");
-                       tag[i].key = ATTR_STYLE;
-                       tag[i++].val = buf;
-               }
-               print_otag(h, TAG_DIV, i, tag);
-               return(1);
-       }
-
-       buffmt("margin-left: -%dem;", INDENT - HALFINDENT);
-
-       tag[0].key = ATTR_CLASS;
-       tag[0].val = "ssec-head";
-       tag[1].key = ATTR_STYLE;
-       tag[1].val = buf;
+       struct tag      *this, *next;

 
 

-       print_otag(h, TAG_DIV, 2, tag);
-       print_otag(h, TAG_SPAN, 1, tag);
-
-       bufinit();
-       for (nn = n->child; nn; nn = nn->next) {
-               bufcat(nn->string);
-               if (nn->next)
-                       bufcat(" ");
+       for (this = h->tag; this != NULL; this = next) {
+               next = this == until ? NULL : this->next;
+               print_ctag(h, this);

        }
        }

-       tag[0].key = ATTR_NAME;
-       tag[0].val = buf;
-       print_otag(h, TAG_A, 1, tag);
-
-       return(1);

 }
 
 }
 

-
-/* ARGSUSED */
-static int
-mdoc_fl_pre(MDOC_ARGS)
+/*
+ * Close out all open elements up to but excluding suntil.
+ * Note that a paragraph just inside stays open together with it
+ * because paragraphs include subsequent phrasing content.
+ */
+void
+print_stagq(struct html *h, const struct tag *suntil)

 {
 {

-       struct htmlpair  tag;
+       struct tag      *this, *next;

 
 

-       tag.key = ATTR_CLASS;
-       tag.val = "flag";
-
-       print_otag(h, TAG_SPAN, 1, &tag);
-       if (MDOC_Fl == n->tok) {
-               print_text(h, "\\-");
-               h->flags |= HTML_NOSPACE;
+       for (this = h->tag; this != NULL; this = next) {
+               next = this->next;
+               if (this == suntil || (next == suntil &&
+                   (this->tag == TAG_P || this->tag == TAG_PRE)))
+                       break;
+               print_ctag(h, this);

        }
        }

-       return(1);

 }
 
 
 }
 
 

-/* ARGSUSED */
-static int
-mdoc_pp_pre(MDOC_ARGS)
-{
-       struct htmlpair tag;
-
-       tag.key = ATTR_STYLE;
-       tag.val = "clear: both; height: 1em;";
-       print_otag(h, TAG_DIV, 1, &tag);
-       return(0);
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_nd_pre(MDOC_ARGS)
-{
-       struct htmlpair  tag;
+/***********************************************************************
+ * Low level output functions.
+ * They implement line breaking using a short static buffer.
+ ***********************************************************************/

 
 

-       if (MDOC_BODY != n->type)
-               return(1);
-
-       /* XXX - this can contain block elements! */
-       print_text(h, "\\(em");
-       tag.key = ATTR_CLASS;
-       tag.val = "desc-body";
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_op_pre(MDOC_ARGS)
-{
-       struct htmlpair  tag;
-
-       if (MDOC_BODY != n->type)
-               return(1);
-
-       /* XXX - this can contain block elements! */
-       print_text(h, "\\(lB");
-       tag.key = ATTR_CLASS;
-       tag.val = "opt";
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
-}
-
-
-/* ARGSUSED */
+/*
+ * Buffer one HTML output byte.
+ * If the buffer is full, flush and deactivate it and start a new line.
+ * If the buffer is inactive, print directly.
+ */

 static void
 static void

-mdoc_op_post(MDOC_ARGS)
+print_byte(struct html *h, char c)

 {
 {

-
-       if (MDOC_BODY != n->type) 
+       if ((h->flags & HTML_BUFFER) == 0) {
+               putchar(c);
+               h->col++;

                return;
                return;

-       h->flags |= HTML_NOSPACE;
-       print_text(h, "\\(rB");
-}
-
-
-static int
-mdoc_nm_pre(MDOC_ARGS)
-{
-       struct htmlpair tag;
-
-       if ( ! (HTML_NEWLINE & h->flags))
-               if (SEC_SYNOPSIS == n->sec) {
-                       tag.key = ATTR_STYLE;
-                       tag.val = "clear: both;";
-                       print_otag(h, TAG_BR, 1, &tag);
-               }
-
-       tag.key = ATTR_CLASS;
-       tag.val = "name";
-
-       print_otag(h, TAG_SPAN, 1, &tag);
-       if (NULL == n->child)
-               print_text(h, m->name);
-
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_xr_pre(MDOC_ARGS)
-{
-       struct htmlpair          tag[2];
-       const char              *name, *sec;
-       const struct mdoc_node  *nn;
-
-       nn = n->child;
-       name = nn && nn->string ? nn->string : "";
-       nn = nn ? nn->next : NULL;
-       sec = nn && nn->string ? nn->string : "";
-
-       buffmt("%s%s%s.html", name, name && sec ? "." : "", sec);
-
-       tag[0].key = ATTR_CLASS;
-       tag[0].val = "link-man";
-       tag[1].key = ATTR_HREF;
-       tag[1].val = buf;
-       print_otag(h, TAG_A, 2, tag);
-
-       nn = n->child;
-       print_text(h, nn->string);
-       if (NULL == (nn = nn->next))
-               return(0);
-
-       h->flags |= HTML_NOSPACE;
-       print_text(h, "(");
-       h->flags |= HTML_NOSPACE;
-       print_text(h, nn->string);
-       h->flags |= HTML_NOSPACE;
-       print_text(h, ")");
-
-       return(0);
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_ns_pre(MDOC_ARGS)
-{
-
-       h->flags |= HTML_NOSPACE;
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_ar_pre(MDOC_ARGS)
-{
-       struct htmlpair tag;
-
-       tag.key = ATTR_CLASS;
-       tag.val = "arg";
-
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_xx_pre(MDOC_ARGS)
-{
-       const char      *pp;
-       struct htmlpair  tag;
-
-       switch (n->tok) {
-       case (MDOC_Bsx):
-               pp = "BSDI BSD/OS";
-               break;
-       case (MDOC_Dx):
-               pp = "DragonFlyBSD";
-               break;
-       case (MDOC_Fx):
-               pp = "FreeBSD";
-               break;
-       case (MDOC_Nx):
-               pp = "NetBSD";
-               break;
-       case (MDOC_Ox):
-               pp = "OpenBSD";
-               break;
-       case (MDOC_Ux):
-               pp = "UNIX";
-               break;
-       default:
-               return(1);
-       }
-
-       tag.key = ATTR_CLASS;
-       tag.val = "unix";
-
-       print_otag(h, TAG_SPAN, 1, &tag);
-       print_text(h, pp);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_tbl_block_pre(MDOC_ARGS, int t, int w, int o, int c)
-{
-       struct htmlpair  tag;
-
-       switch (t) {
-       case (MDOC_Column):
-               /* FALLTHROUGH */
-       case (MDOC_Item):
-               /* FALLTHROUGH */
-       case (MDOC_Ohang):
-               buffmt("margin-left: %dem; clear: both;", o);
-               break;
-       default:
-               buffmt("margin-left: %dem; clear: both;", w + o);
-               break;
-       }
-
-       if ( ! c && n->prev && n->prev->body->child)
-               bufcat("padding-top: 1em;");
-
-       tag.key = ATTR_STYLE;
-       tag.val = buf;
-       print_otag(h, TAG_DIV, 1, &tag);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_tbl_body_pre(MDOC_ARGS, int t, int w)
-{
-
-       print_otag(h, TAG_DIV, 0, NULL);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_tbl_head_pre(MDOC_ARGS, int t, int w)
-{
-       struct htmlpair  tag;
-       struct ord      *ord;
-       char             nbuf[BUFSIZ];
-
-       switch (t) {
-       case (MDOC_Item):
-               /* FALLTHROUGH */
-       case (MDOC_Ohang):
-               print_otag(h, TAG_DIV, 0, NULL);
-               break;
-       case (MDOC_Column):
-               buffmt("min-width: %dem;", w);
-               bufcat("clear: none;");
-               if (n->next && MDOC_HEAD == n->next->type)
-                       bufcat("float: left;");
-               tag.key = ATTR_STYLE;
-               tag.val = buf;
-               print_otag(h, TAG_DIV, 1, &tag);
-               break;
-       default:
-               buffmt("margin-left: -%dem;", w);
-               bufcat("clear: left;");
-               bufcat("float: left;");
-               bufcat("padding-right: 1em;");
-               tag.key = ATTR_STYLE;
-               tag.val = buf;
-               print_otag(h, TAG_DIV, 1, &tag);
-               break;
-       }
-
-       switch (t) {
-       case (MDOC_Diag):
-               tag.key = ATTR_CLASS;
-               tag.val = "diag";
-               print_otag(h, TAG_SPAN, 1, &tag);
-               break;
-       case (MDOC_Enum):
-               ord = SLIST_FIRST(&h->ords);
-               assert(ord);
-               nbuf[BUFSIZ - 1] = 0;
-               (void)snprintf(nbuf, BUFSIZ - 1, "%d.", ord->pos++);
-               print_text(h, nbuf);
-               return(0);
-       case (MDOC_Dash):
-               print_text(h, "\\(en");
-               return(0);
-       case (MDOC_Hyphen):
-               print_text(h, "\\-");
-               return(0);
-       case (MDOC_Bullet):
-               print_text(h, "\\(bu");
-               return(0);
-       default:
-               break;
-       }
-
-       return(1);
-}
-
-
-static int
-mdoc_tbl_pre(MDOC_ARGS, int type)
-{
-       int                      i, w, o, c, wp;
-       const struct mdoc_node  *bl, *nn;
-
-       bl = n->parent->parent;
-       if (MDOC_BLOCK != n->type) 
-               bl = bl->parent;
-
-       /* FIXME: fmt_vspace() equivalent. */
-
-       assert(bl->args);
-
-       w = o = c = 0;
-       wp = -1;
-
-       for (i = 0; i < (int)bl->args->argc; i++) 
-               if (MDOC_Width == bl->args->argv[i].arg) {
-                       assert(bl->args->argv[i].sz);
-                       wp = i;
-                       w = out_a2width(bl->args->argv[i].value[0]);
-               } else if (MDOC_Offset == bl->args->argv[i].arg) {
-                       assert(bl->args->argv[i].sz);
-                       o = out_a2offs
-                               (bl->args->argv[i].value[0], INDENT);
-               } else if (MDOC_Compact == bl->args->argv[i].arg) 
-                       c = 1;
-       
-       if (MDOC_HEAD == n->type && MDOC_Column == type) {
-               nn = n->parent->child;
-               assert(nn && MDOC_HEAD == nn->type);
-               for (i = 0; nn && nn != n; nn = nn->next, i++)
-                       /* Counter... */ ;
-               assert(nn);
-               if (wp >= 0 && i < (int)bl->args[wp].argv->sz)
-                       w = out_a2width(bl->args->argv[wp].value[i]);
-       }
-
-       switch (type) {
-       case (MDOC_Enum):
-               /* FALLTHROUGH */
-       case (MDOC_Dash):
-               /* FALLTHROUGH */
-       case (MDOC_Hyphen):
-               /* FALLTHROUGH */
-       case (MDOC_Bullet):
-               if (w < 4)
-                       w = 4;
-               break;
-       case (MDOC_Inset):
-               /* FALLTHROUGH */
-       case (MDOC_Diag):
-               w = 1;
-               break;
-       default:
-               if (0 == w)
-                       w = 10;
-               break;

        }
 
        }
 

-       switch (n->type) {
-       case (MDOC_BLOCK):
-               break;
-       case (MDOC_HEAD):
-               return(mdoc_tbl_head_pre(m, n, h, type, w));
-       case (MDOC_BODY):
-               return(mdoc_tbl_body_pre(m, n, h, type, w));
-       default:
-               abort();
-               /* NOTREACHED */
-       }
-
-       return(mdoc_tbl_block_pre(m, n, h, type, w, o, c));
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_bl_pre(MDOC_ARGS)
-{
-       struct ord      *ord;
-
-       if (MDOC_BLOCK != n->type)
-               return(1);
-       if (MDOC_Enum != out_a2list(n))
-               return(1);
-
-       ord = malloc(sizeof(struct ord));
-       if (NULL == ord)
-               err(EXIT_FAILURE, "malloc");
-       ord->cookie = n;
-       ord->pos = 1;
-       SLIST_INSERT_HEAD(&h->ords, ord, entry);
-
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-mdoc_bl_post(MDOC_ARGS)
-{
-       struct ord      *ord;
-
-       if (MDOC_BLOCK != n->type)
+       if (h->col + h->bufcol < sizeof(h->buf)) {
+               h->buf[h->bufcol++] = c;

                return;
                return;

-       if (MDOC_Enum != out_a2list(n))
-               return;
-
-       ord = SLIST_FIRST(&h->ords);
-       assert(ord);
-       SLIST_REMOVE_HEAD(&h->ords, entry);
-       free(ord);
-}
-
-
-static int
-mdoc_it_pre(MDOC_ARGS)
-{
-       int              type;
-
-       if (MDOC_BLOCK == n->type)
-               type = out_a2list(n->parent->parent);
-       else
-               type = out_a2list(n->parent->parent->parent);
-
-       return(mdoc_tbl_pre(m, n, h, type));
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_ex_pre(MDOC_ARGS)
-{
-       const struct mdoc_node  *nn;
-       struct tag              *t;
-       struct htmlpair          tag;
-
-       print_text(h, "The");
-
-       tag.key = ATTR_CLASS;
-       tag.val = "utility";
-
-       for (nn = n->child; nn; nn = nn->next) {
-               t = print_otag(h, TAG_SPAN, 1, &tag);
-               print_text(h, nn->string);
-               print_tagq(h, t);
-
-               h->flags |= HTML_NOSPACE;
-
-               if (nn->next && NULL == nn->next->next)
-                       print_text(h, ", and");
-               else if (nn->next)
-                       print_text(h, ",");
-               else
-                       h->flags &= ~HTML_NOSPACE;

        }
 
        }
 

-       if (n->child->next)
-               print_text(h, "utilities exit");
-       else
-               print_text(h, "utility exits");
-
-               print_text(h, "0 on success, and >0 if an error occurs.");
-       return(0);
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_dq_pre(MDOC_ARGS)
-{
-
-       if (MDOC_BODY != n->type)
-               return(1);
-       print_text(h, "\\(lq");
-       h->flags |= HTML_NOSPACE;
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-mdoc_dq_post(MDOC_ARGS)
-{
-
-       if (MDOC_BODY != n->type)
-               return;
-       h->flags |= HTML_NOSPACE;
-       print_text(h, "\\(rq");
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_pq_pre(MDOC_ARGS)
-{
-
-       if (MDOC_BODY != n->type)
-               return(1);
-       print_text(h, "\\&(");
-       h->flags |= HTML_NOSPACE;
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-mdoc_pq_post(MDOC_ARGS)
-{
-
-       if (MDOC_BODY != n->type)
-               return;
-       print_text(h, ")");
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_sq_pre(MDOC_ARGS)
-{
-
-       if (MDOC_BODY != n->type)
-               return(1);
-       print_text(h, "\\(oq");
-       h->flags |= HTML_NOSPACE;
-       return(1);
+       putchar('\n');
+       h->col = 0;
+       print_indent(h);
+       putchar(' ');
+       putchar(' ');
+       fwrite(h->buf, h->bufcol, 1, stdout);
+       putchar(c);
+       h->col = (h->indent + 1) * 2 + h->bufcol + 1;
+       h->bufcol = 0;
+       h->flags &= ~HTML_BUFFER;

 }
 
 }
 

-
-/* ARGSUSED */
-static void
-mdoc_sq_post(MDOC_ARGS)
+/*
+ * If something was printed on the current output line, end it.
+ * Not to be called right after print_indent().
+ */
+void
+print_endline(struct html *h)

 {
 {

-
-       if (MDOC_BODY != n->type)
+       if (h->col == 0)

                return;
                return;

-       h->flags |= HTML_NOSPACE;
-       print_text(h, "\\(aq");
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_em_pre(MDOC_ARGS)
-{
-       struct htmlpair tag;
-
-       tag.key = ATTR_CLASS;
-       tag.val = "emph";
-
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_d1_pre(MDOC_ARGS)
-{
-       struct htmlpair tag[2];
-
-       if (MDOC_BLOCK != n->type)
-               return(1);

 
 

-       buffmt("margin-left: %dem;", INDENT);
-
-       tag[0].key = ATTR_CLASS;
-       tag[0].val = "lit-block";
-       tag[1].key = ATTR_STYLE;
-       tag[1].val = buf;
-
-       print_otag(h, TAG_DIV, 2, tag);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_sx_pre(MDOC_ARGS)
-{
-       struct htmlpair          tag[2];
-       const struct mdoc_node  *nn;
-
-       bufcat("#");
-       for (nn = n->child; nn; nn = nn->next) {
-               bufcat(nn->string);
-               if (nn->next)
-                       bufcat(" ");
+       if (h->bufcol) {
+               putchar(' ');
+               fwrite(h->buf, h->bufcol, 1, stdout);
+               h->bufcol = 0;

        }
        }

-
-       tag[0].key = ATTR_HREF;
-       tag[0].val = buf;
-       tag[1].key = ATTR_CLASS;
-       tag[1].val = "link-sec";
-
-       print_otag(h, TAG_A, 2, tag);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_aq_pre(MDOC_ARGS)
-{
-
-       if (MDOC_BODY != n->type)
-               return(1);
-       print_text(h, "\\(la");
+       putchar('\n');
+       h->col = 0;

        h->flags |= HTML_NOSPACE;
        h->flags |= HTML_NOSPACE;

-       return(1);
+       h->flags &= ~HTML_BUFFER;

 }
 
 }
 

-
-/* ARGSUSED */
+/*
+ * Flush the HTML output buffer.
+ * If it is inactive, activate it.
+ */

 static void
 static void

-mdoc_aq_post(MDOC_ARGS)
+print_endword(struct html *h)

 {
 {

-
-       if (MDOC_BODY != n->type)
+       if (h->noindent) {
+               print_byte(h, ' ');

                return;
                return;

-       h->flags |= HTML_NOSPACE;
-       print_text(h, "\\(ra");
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_bd_pre(MDOC_ARGS)
-{
-       struct htmlpair          tag[2];
-       int                      t, c, o, i;
-       const struct mdoc_node  *bl;
-
-       /* FIXME: fmt_vspace() shit. */
-
-       if (MDOC_BLOCK == n->type)
-               bl = n;
-       else if (MDOC_HEAD == n->type)
-               return(0);
-       else
-               bl = n->parent;
-
-       t = o = c = 0;
-
-       for (i = 0; i < (int)bl->args->argc; i++) 
-               switch (bl->args->argv[i].arg) {
-               case (MDOC_Offset):
-                       assert(bl->args->argv[i].sz);
-                       o = out_a2offs
-                               (bl->args->argv[i].value[0], INDENT);
-                       break;
-               case (MDOC_Compact):
-                       c = 1;
-                       break;
-               case (MDOC_Ragged):
-                       /* FALLTHROUGH */
-               case (MDOC_Filled):
-                       /* FALLTHROUGH */
-               case (MDOC_Unfilled):
-                       /* FALLTHROUGH */
-               case (MDOC_Literal):
-                       t = bl->args->argv[i].arg;
-                       break;
-               }
-
-       if (MDOC_BLOCK == n->type) {
-               if (o)
-                       buffmt("margin-left: %dem;", o);
-               bufcat("margin-top: 1em;");
-               tag[0].key = ATTR_STYLE;
-               tag[0].val = buf;
-               print_otag(h, TAG_DIV, 1, tag);
-               return(1);

        }
 
        }
 

-       switch (t) {
-       case (MDOC_Unfilled):
-       case (MDOC_Literal):
-               break;
-       default:
-               return(1);
+       if ((h->flags & HTML_BUFFER) == 0) {
+               h->col++;
+               h->flags |= HTML_BUFFER;
+       } else if (h->bufcol) {
+               putchar(' ');
+               fwrite(h->buf, h->bufcol, 1, stdout);
+               h->col += h->bufcol + 1;

        }
        }

-
-       bufcat("white-space: pre;");
-       tag[0].key = ATTR_STYLE;
-       tag[0].val = buf;
-       tag[1].key = ATTR_CLASS;
-       tag[1].val = "lit-block";
-
-       print_otag(h, TAG_DIV, 2, tag);
-
-       for (n = n->child; n; n = n->next) {
-               h->flags |= HTML_NOSPACE;
-               print_mdoc_node(m, n, h);
-               if (n->next)
-                       print_text(h, "\n");
-       }
-
-       return(0);
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_pa_pre(MDOC_ARGS)
-{
-       struct htmlpair tag;
-
-       tag.key = ATTR_CLASS;
-       tag.val = "file";
-
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
+       h->bufcol = 0;

 }
 
 }
 

-
-/* ARGSUSED */
-static int
-mdoc_qq_pre(MDOC_ARGS)
-{
-
-       if (MDOC_BODY != n->type)
-               return(1);
-       print_text(h, "\\*q");
-       h->flags |= HTML_NOSPACE;
-       return(1);
-}
-
-
-/* ARGSUSED */
+/*
+ * If at the beginning of a new output line,
+ * perform indentation and mark the line as containing output.
+ * Make sure to really produce some output right afterwards,
+ * but do not use print_otag() for producing it.
+ */

 static void
 static void

-mdoc_qq_post(MDOC_ARGS)
+print_indent(struct html *h)

 {
 {

+       size_t   i;

 
 

-       if (MDOC_BODY != n->type)
+       if (h->col || h->noindent)

                return;
                return;

-       h->flags |= HTML_NOSPACE;
-       print_text(h, "\\*q");
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_ad_pre(MDOC_ARGS)
-{
-       struct htmlpair tag;
-
-       tag.key = ATTR_CLASS;
-       tag.val = "addr";
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_an_pre(MDOC_ARGS)
-{
-       struct htmlpair tag;
-
-       tag.key = ATTR_CLASS;
-       tag.val = "author";
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_cd_pre(MDOC_ARGS)
-{
-       struct htmlpair tag;
-
-       tag.key = ATTR_CLASS;
-       tag.val = "config";
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_dv_pre(MDOC_ARGS)
-{
-       struct htmlpair tag;
-
-       tag.key = ATTR_CLASS;
-       tag.val = "define";
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_ev_pre(MDOC_ARGS)
-{
-       struct htmlpair tag;
-
-       tag.key = ATTR_CLASS;
-       tag.val = "env";
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_er_pre(MDOC_ARGS)
-{
-       struct htmlpair tag;
-
-       tag.key = ATTR_CLASS;
-       tag.val = "errno";
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_fa_pre(MDOC_ARGS)
-{
-       const struct mdoc_node  *nn;
-       struct htmlpair          tag;
-       struct tag              *t;
-
-       tag.key = ATTR_CLASS;
-       tag.val = "farg";
-
-       if (n->parent->tok != MDOC_Fo) {
-               print_otag(h, TAG_SPAN, 1, &tag);
-               return(1);
-       }
-
-       for (nn = n->child; nn; nn = nn->next) {
-               t = print_otag(h, TAG_SPAN, 1, &tag);
-               print_text(h, nn->string);
-               print_tagq(h, t);
-               if (nn->next)
-                       print_text(h, ",");
-       }
-
-       if (n->child && n->next && n->next->tok == MDOC_Fa)
-               print_text(h, ",");
-
-       return(0);
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_fd_pre(MDOC_ARGS)
-{
-       struct htmlpair tag;
-
-       if (SEC_SYNOPSIS == n->sec) {
-               if (n->next && MDOC_Fd != n->next->tok) {
-                       tag.key = ATTR_STYLE;
-                       tag.val = "margin-bottom: 1em;";
-                       print_otag(h, TAG_DIV, 1, &tag);
-               } else
-                       print_otag(h, TAG_DIV, 0, NULL);
-       }
-
-       tag.key = ATTR_CLASS;
-       tag.val = "macro";
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_vt_pre(MDOC_ARGS)
-{
-       struct htmlpair tag;
-
-       if (SEC_SYNOPSIS == n->sec) {
-               if (n->next && MDOC_Vt != n->next->tok) {
-                       tag.key = ATTR_STYLE;
-                       tag.val = "margin-bottom: 1em;";
-                       print_otag(h, TAG_DIV, 1, &tag);
-               } else
-                       print_otag(h, TAG_DIV, 0, NULL);
-       }

 
 

-       tag.key = ATTR_CLASS;
-       tag.val = "type";
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
+       h->col = h->indent * 2;
+       for (i = 0; i < h->col; i++)
+               putchar(' ');

 }
 
 }
 

-/* ARGSUSED */
-static int
-mdoc_ft_pre(MDOC_ARGS)
-{
-       struct htmlpair tag;
-
-       if (SEC_SYNOPSIS == n->sec) {
-               if (n->prev && MDOC_Fo == n->prev->tok) {
-                       tag.key = ATTR_STYLE;
-                       tag.val = "magin-bottom: 1em;";
-                       print_otag(h, TAG_DIV, 1, &tag);
-               } else
-                       print_otag(h, TAG_DIV, 0, NULL);
-       }
-
-       tag.key = ATTR_CLASS;
-       tag.val = "type";
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_fn_pre(MDOC_ARGS)
+/*
+ * Print or buffer some characters
+ * depending on the current HTML output buffer state.
+ */
+static void
+print_word(struct html *h, const char *cp)

 {
 {

-       struct tag              *t;
-       struct htmlpair          tag;
-       const struct mdoc_node  *nn;
-
-       if (SEC_SYNOPSIS == n->sec) {
-               if (n->next) {
-                       tag.key = ATTR_STYLE;
-                       tag.val = "margin-bottom: 1em";
-                       print_otag(h, TAG_DIV, 1, &tag);
-               } else
-                       print_otag(h, TAG_DIV, 0, NULL);
-       }
-
-       tag.key = ATTR_CLASS;
-       tag.val = "type";
-
-       t = print_otag(h, TAG_SPAN, 1, &tag);
-       print_text(h, n->child->string);
-       print_tagq(h, t);
-
-       h->flags |= HTML_NOSPACE;
-       print_text(h, "(");
-
-       for (nn = n->child->next; nn; nn = nn->next) {
-               tag.key = ATTR_CLASS;
-               tag.val = "farg";
-               t = print_otag(h, TAG_SPAN, 1, &tag);
-               print_text(h, nn->string);
-               print_tagq(h, t);
-               if (nn->next)
-                       print_text(h, ",");
-       }
-
-       print_text(h, ")");
-
-       if (SEC_SYNOPSIS == n->sec)
-               print_text(h, ";");
-
-       return(0);
+       while (*cp != '\0')
+               print_byte(h, *cp++);

 }
 }