]> git.cameronkatri.com Git - mandoc.git/blobdiff - html.c
git.ckatri.com / mandoc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Enable generation of the desired delim/basic output with groff(1).
[mandoc.git] / html.c
diff --git a/html.c b/html.c
index dd0e595c77fd36351a6fda37bd78db3337549f17..50fa78ce0cc5b2e30b9cae689dc5f4fe7f964b54 100644 (file)
--- a/html.c
+++ b/html.c
@@ -1,1054 +1,988 @@
-/* $Id: html.c,v 1.22 2008/12/10 12:05:33 kristaps Exp $ */
+/*     $Id: html.c,v 1.261 2019/09/05 13:35:04 schwarze Exp $ */
 /*
 /*
- * Copyright (c) 2008 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
  *
  * 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.
+ * 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 WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR 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.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * 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.
  */
  */
-#include <sys/param.h>
+#include "config.h"
+
+#include <sys/types.h>
 #include <sys/stat.h>
 
 #include <assert.h>
 #include <sys/stat.h>
 
 #include <assert.h>
-#include <err.h>
-#include <fcntl.h>
-#include <stdlib.h>
+#include <ctype.h>
+#include <stdarg.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 #include <string.h>
 #include <unistd.h>
 
+#include "mandoc_aux.h"
+#include "mandoc_ohash.h"
+#include "mandoc.h"
+#include "roff.h"
+#include "out.h"
 #include "html.h"
 #include "html.h"
-#include "ml.h"
-
-/* TODO: allow head/tail-less invocations (just "div" start). */
-
-struct htmlnode {
-       int              tok;
-       enum md_ns       ns;
-       int              argc[ROFF_MAXLINEARG];
-       char            *argv[ROFF_MAXLINEARG];
-       struct htmlnode *parent;
+#include "manconf.h"
+#include "main.h"
+
+struct htmldata {
+       const char       *name;
+       int               flags;
+#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. */
 };
 
 };
 
-struct htmlq {
-       struct htmlnode *last;
+static const struct htmldata htmltags[TAG_MAX] = {
+       {"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},
 };
 
 };
 
+/* Avoid duplicate HTML id= attributes. */
+static struct ohash     id_unique;
 
 
-static int             html_loadcss(struct md_mbuf *, 
-                               const char *);
-static int             html_alloc(void **);
-static void            html_free(void *);
-static ssize_t         html_endtag(struct md_mbuf *, void *,
-                               const struct md_args *, 
-                               enum md_ns, int);
-static ssize_t         html_beginstring(struct md_mbuf *, 
-                               const struct md_args *, 
-                               const char *, size_t);
-static ssize_t         html_beginhttp(struct md_mbuf *, 
-                               const struct md_args *, 
-                               const char *, size_t);
-static ssize_t         html_endstring(struct md_mbuf *, 
-                               const struct md_args *, 
-                               const char *, size_t);
-static ssize_t         html_endhttp(struct md_mbuf *, 
-                               const struct md_args *, 
-                               const char *, size_t);
-static ssize_t         html_begintag(struct md_mbuf *, void *,
-                               const struct md_args *, 
-                               enum md_ns, int, 
-                               const int *, const char **);
-static int             html_begin(struct md_mbuf *,
-                               const struct md_args *, 
-                               const struct tm *, 
-                               const char *, const char *, 
-                               enum roffmsec, enum roffvol);
-static int             html_printargs(struct md_mbuf *, int, 
-                               const char *, const int *, 
-                               const char **, size_t *);
-static int             html_end(struct md_mbuf *,
-                               const struct md_args *, 
-                               const struct tm *, 
-                               const char *, const char *, 
-                               enum roffmsec, enum roffvol);
-static int             html_blocktagname(struct md_mbuf *,
-                               const struct md_args *, int, 
-                               struct htmlq *, const int *, 
-                               const char **, size_t *);
-static int             html_blocktagargs(struct md_mbuf *,
-                               const struct md_args *, int,
-                               const int *, const char **, size_t *);
-static int             html_headtagname(struct md_mbuf *,
-                               const struct md_args *, int, 
-                               struct htmlq *, const int *, 
-                               const char **, size_t *);
-static int             html_headtagargs(struct md_mbuf *,
-                               const struct md_args *, int,
-                               const int *, const char **, size_t *);
-static int             html_bodytagname(struct md_mbuf *,
-                               const struct md_args *, 
-                               int, struct htmlq *, const int *, 
-                               const char **, size_t *);
-static int             html_bodytagargs(struct md_mbuf *,
-                               const struct md_args *, int,
-                               const int *, const char **, size_t *);
-static int             html_inlinetagname(struct md_mbuf *,
-                               const struct md_args *, int, size_t *);
-static int             html_inlinetagargs(struct md_mbuf *,
-                               const struct md_args *, int,
-                               const int *, const char **, size_t *);
-static int             html_Bl_bodytagname(struct md_mbuf *, 
-                               struct htmlq *, const int *, 
-                               const char **, size_t *);
-static int             html_It_blocktagname(struct md_mbuf *, 
-                               struct htmlq *, const int *, 
-                               const char **, size_t *);
-static int             html_It_headtagname(struct md_mbuf *, 
-                               struct htmlq *, const int *, 
-                               const char **, size_t *);
-static int             html_It_bodytagname(struct md_mbuf *, 
-                               struct htmlq *, const int *, 
-                               const char **, size_t *);
-static int             html_tputln(struct md_mbuf *, 
-                               enum ml_scope, int, enum html_tag);
-static int             html_aputln(struct md_mbuf *, enum ml_scope, 
-                               int, enum html_tag, 
-                               int, const struct html_pair *);
-
-
-/* ARGSUSED */
-static int
-html_It_headtagname(struct md_mbuf *mbuf, struct htmlq *q, 
-               const int *argc, const char **argv, size_t *res)
-{
-       struct htmlnode *n;
-       int              i;
-
-       for (n = q->last; n; n = n->parent)
-               if (n->tok == ROFF_Bl)
-                       break;
-
-       assert(n);
-
-       /* LINTED */
-       for (i = 0; ROFF_ARGMAX != n->argc[i] &&
-                       i < ROFF_MAXLINEARG; i++) {
-               switch (n->argc[i]) {
-               case (ROFF_Ohang):
-                       return(html_stput(mbuf, HTML_TAG_DIV, res));
-               case (ROFF_Tag):
-                       /* FALLTHROUGH */
-               case (ROFF_Column): 
-                       return(html_stput(mbuf, HTML_TAG_TD, res));
-               default:
-                       break;
-               }
-       }
+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 *);
 
 
-       return(0);
-}
+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 *);
 
 
 
 
-/* ARGSUSED */
-static int
-html_It_bodytagname(struct md_mbuf *mbuf, struct htmlq *q, 
-               const int *argc, const char **argv, size_t *res)
+void *
+html_alloc(const struct manoutput *outopts)
 {
 {
-       struct htmlnode *n;
-       int              i;
+       struct html     *h;
 
 
-       for (n = q->last; n; n = n->parent)
-               if (n->tok == ROFF_Bl)
-                       break;
+       h = mandoc_calloc(1, sizeof(struct html));
 
 
-       assert(n);
-
-       /* LINTED */
-       for (i = 0; ROFF_ARGMAX != n->argc[i] &&
-                       i < ROFF_MAXLINEARG; i++) {
-               switch (n->argc[i]) {
-               case (ROFF_Enum):
-                       /* FALLTHROUGH */
-               case (ROFF_Bullet):
-                       /* FALLTHROUGH */
-               case (ROFF_Dash):
-                       /* FALLTHROUGH */
-               case (ROFF_Hyphen):
-                       /* FALLTHROUGH */
-               case (ROFF_Item):
-                       /* FALLTHROUGH */
-               case (ROFF_Diag):
-                       /* FALLTHROUGH */
-               case (ROFF_Hang):
-                       /* FALLTHROUGH */
-               case (ROFF_Ohang): 
-                       /* FALLTHROUGH */
-               case (ROFF_Inset):
-                       return(html_stput(mbuf, HTML_TAG_DIV, res));
-               case (ROFF_Tag):
-                       /* FALLTHROUGH */
-               case (ROFF_Column): 
-                       return(html_stput(mbuf, HTML_TAG_TD, res));
-               default:
-                       break;
-               }
-       }
+       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;
 
 
-       assert(i != ROFF_MAXLINEARG);
-       return(0);
-}
+       mandoc_ohash_init(&id_unique, 4, 0);
 
 
+       return h;
+}
 
 
-/* ARGSUSED */
-static int
-html_Bl_bodytagname(struct md_mbuf *mbuf, struct htmlq *q, 
-               const int *argc, const char **argv, size_t *res)
+static void
+html_reset_internal(struct html *h)
 {
 {
-       int              i;
-
-       for (i = 0; ROFF_ARGMAX != argc[i]
-                       && i < ROFF_MAXLINEARG; i++) {
-               switch (argc[i]) {
-               case (ROFF_Enum):
-                       return(html_stput(mbuf, HTML_TAG_OL, res));
-               case (ROFF_Bullet):
-                       /* FALLTHROUGH */
-               case (ROFF_Dash):
-                       /* FALLTHROUGH */
-               case (ROFF_Hyphen):
-                       /* FALLTHROUGH */
-               case (ROFF_Item):
-                       /* FALLTHROUGH */
-               case (ROFF_Diag):
-                       /* FALLTHROUGH */
-               case (ROFF_Hang):
-                       /* FALLTHROUGH */
-               case (ROFF_Ohang): 
-                       /* FALLTHROUGH */
-               case (ROFF_Inset):
-                       return(html_stput(mbuf, HTML_TAG_UL, res));
-               case (ROFF_Tag):
-                       /* FALLTHROUGH */
-               case (ROFF_Column): 
-                       return(html_stput(mbuf, HTML_TAG_TABLE, res));
-               default:
-                       break;
-               }
-       }
+       struct tag      *tag;
+       char            *cp;
+       unsigned int     slot;
 
 
-       assert(i != ROFF_MAXLINEARG);
-       return(0);
+       while ((tag = h->tag) != NULL) {
+               h->tag = tag->next;
+               free(tag);
+       }
+       cp = ohash_first(&id_unique, &slot);
+       while (cp != NULL) {
+               free(cp);
+               cp = ohash_next(&id_unique, &slot);
+       }
+       ohash_delete(&id_unique);
 }
 
 }
 
+void
+html_reset(void *p)
+{
+       html_reset_internal(p);
+       mandoc_ohash_init(&id_unique, 4, 0);
+}
 
 
-/* ARGSUSED */
-static int
-html_It_blocktagname(struct md_mbuf *mbuf, struct htmlq *q, 
-               const int *argc, const char **argv, size_t *res)
+void
+html_free(void *p)
 {
 {
-       struct htmlnode *n;
-       int              i;
+       html_reset_internal(p);
+       free(p);
+}
 
 
-       for (n = q->last; n; n = n->parent)
-               if (n->tok == ROFF_Bl)
-                       break;
+void
+print_gen_head(struct html *h)
+{
+       struct tag      *t;
 
 
-       assert(n);
-
-       /* LINTED */
-       for (i = 0; ROFF_ARGMAX != n->argc[i] &&
-                       i < ROFF_MAXLINEARG; i++) {
-               switch (n->argc[i]) {
-               case (ROFF_Enum):
-                       /* FALLTHROUGH */
-               case (ROFF_Bullet):
-                       /* FALLTHROUGH */
-               case (ROFF_Dash):
-                       /* FALLTHROUGH */
-               case (ROFF_Hyphen):
-                       /* FALLTHROUGH */
-               case (ROFF_Item):
-                       /* FALLTHROUGH */
-               case (ROFF_Diag):
-                       /* FALLTHROUGH */
-               case (ROFF_Hang):
-                       /* FALLTHROUGH */
-               case (ROFF_Ohang): 
-                       /* FALLTHROUGH */
-               case (ROFF_Inset):
-                       return(html_stput(mbuf, HTML_TAG_LI, res));
-               case (ROFF_Tag):
-                       /* FALLTHROUGH */
-               case (ROFF_Column): 
-                       return(html_stput(mbuf, HTML_TAG_TR, res));
-               default:
-                       break;
-               }
+       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;
        }
 
        }
 
-       assert(i != ROFF_MAXLINEARG);
-       return(0);
+       /*
+        * 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 int
-html_loadcss(struct md_mbuf *mbuf, const char *css)
+int
+html_setfont(struct html *h, enum mandoc_esc font)
 {
 {
-       size_t           res, bufsz;
-       char            *buf;
-       struct stat      st;
-       int              fd, c;
-       ssize_t          ssz;
-
-       c = 0;
-       res = 0;
-       buf = NULL;
-
-       if (-1 == (fd = open(css, O_RDONLY, 0))) {
-               warn("%s", css);
-               return(0);
-       } 
-       
-       if (-1 == fstat(fd, &st)) {
-               warn("%s", css);
-               goto out;
-       }
-
-       bufsz = MAX(st.st_blksize, BUFSIZ);
-       if (NULL == (buf = malloc(bufsz))) {
-               warn("malloc");
-               goto out;
+       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;
+}
 
 
-       for (;;) {
-               if (-1 == (ssz = read(fd, buf, bufsz))) {
-                       warn("%s", css);
-                       goto out;
-               } else if (0 == ssz)
-                       break;
-               if ( ! ml_nputs(mbuf, buf, (size_t)ssz, &res))
-                       goto out;
+static void
+print_metaf(struct html *h)
+{
+       if (h->metaf) {
+               print_tagq(h, h->metaf);
+               h->metaf = NULL;
        }
        }
-
-       c = 1;
-
-out:
-       if (-1 == close(fd)) {
-               warn("%s", css);
-               c = 0;
+       switch (h->metac) {
+       case ESCAPE_FONTITALIC:
+               h->metaf = print_otag(h, TAG_I, "");
+               break;
+       case ESCAPE_FONTBOLD:
+               h->metaf = print_otag(h, TAG_B, "");
+               break;
+       case ESCAPE_FONTBI:
+               h->metaf = print_otag(h, TAG_B, "");
+               print_otag(h, TAG_I, "");
+               break;
+       case ESCAPE_FONTCW:
+               h->metaf = print_otag(h, TAG_SPAN, "c", "Li");
+               break;
+       default:
+               break;
        }
        }
-
-       if (buf)
-               free(buf);
-
-       return(c);
 }
 
 }
 
-
-static int
-html_tputln(struct md_mbuf *mbuf, enum ml_scope scope,
-               int i, enum html_tag tag)
+void
+html_close_paragraph(struct html *h)
 {
 {
+       struct tag      *this, *next;
+       int              flags;
 
 
-       if ( ! ml_putchars(mbuf, ' ', INDENT(i) * INDENT_SZ, NULL))
-               return(0);
-       if ( ! html_tput(mbuf, scope, tag, NULL))
-               return(0);
-       return(ml_nputs(mbuf, "\n", 1, NULL));
+       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 int
-html_aputln(struct md_mbuf *mbuf, enum ml_scope scope, int i, 
-               enum html_tag tag, int sz, const struct html_pair *p)
+/*
+ * 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;
+       enum roff_tok    had;
 
 
-       if ( ! ml_putchars(mbuf, ' ', INDENT(i) * INDENT_SZ, NULL))
-               return(0);
-       if ( ! html_aput(mbuf, scope, tag, NULL, sz, p))
-               return(0);
-       return(ml_nputs(mbuf, "\n", 1, NULL));
-}
+       for (t = h->tag; t != NULL; t = t->next)
+               if (t->tag == TAG_PRE)
+                       break;
 
 
+       had = t == NULL ? ROFF_fi : ROFF_nf;
 
 
-/* ARGSUSED */
-static int 
-html_begin(struct md_mbuf *mbuf, const struct md_args *args,
-               const struct tm *tm, const char *os, 
-               const char *name, enum roffmsec msec, enum roffvol vol)
-{
-       enum roffvol     bvol;
-       struct html_pair attr[4];
-       char             ts[32], title[64];
-       int              i;
-
-       (void)snprintf(ts, sizeof(ts), "%s(%s)", 
-                       name, roff_msecname(msec));
-
-       if (vol >= ROFF_ARCH_START) {
-               switch (msec) {
-               case(ROFF_MSEC_1):
-                       /* FALLTHROUGH */
-               case(ROFF_MSEC_6):
-                       /* FALLTHROUGH */
-               case(ROFF_MSEC_7):
-                       bvol = ROFF_VOL_URM;
-                       break;
-               case(ROFF_MSEC_2):
-                       /* FALLTHROUGH */
-               case(ROFF_MSEC_3):
-                       /* FALLTHROUGH */
-               case(ROFF_MSEC_3p):
-                       /* FALLTHROUGH */
-               case(ROFF_MSEC_4):
-                       /* FALLTHROUGH */
-               case(ROFF_MSEC_5):
-                       bvol = ROFF_VOL_PRM;
+       if (want != had) {
+               switch (want) {
+               case ROFF_fi:
+                       print_tagq(h, t);
                        break;
                        break;
-               case(ROFF_MSEC_8):
-                       bvol = ROFF_VOL_PRM;
+               case ROFF_nf:
+                       html_close_paragraph(h);
+                       print_otag(h, TAG_PRE, "");
                        break;
                        break;
-               case(ROFF_MSEC_9):
-                       bvol = ROFF_VOL_KM;
-                       break;
-               case(ROFF_MSEC_UNASS):
-                       /* FALLTHROUGH */
-               case(ROFF_MSEC_DRAFT):
-                       /* FALLTHROUGH */
-               case(ROFF_MSEC_PAPER):
-                       bvol = ROFF_VOL_NONE;
+               case TOKEN_NONE:
                        break;
                default:
                        abort();
                        break;
                default:
                        abort();
-                       /* NOTREACHED */
                }
                }
-
-               (void)snprintf(title, sizeof(title), "%s (%s)",
-                               roff_volname(bvol), roff_volname(vol));
-       } else
-               (void)snprintf(title, sizeof(title), "%s", roff_volname(vol));
-
-
-       i = 0;
-
-       if ( ! html_typeput(mbuf, HTML_TYPE_4_01_STRICT, NULL))
-               return(0);
-       if ( ! html_tputln(mbuf, ML_OPEN, i, HTML_TAG_HTML))
-               return(0);
-       if ( ! html_tputln(mbuf, ML_OPEN, i++, HTML_TAG_HEAD))
-               return(0);
-
-       attr[0].attr = HTML_ATTR_HTTP_EQUIV;
-       attr[0].val = "content-type";
-       attr[1].attr = HTML_ATTR_CONTENT;
-       attr[1].val = "text/html;charset=utf-8";
-
-       if ( ! html_aputln(mbuf, ML_OPEN, i, HTML_TAG_META, 2, attr))
-               return(0);
-
-       attr[0].attr = HTML_ATTR_NAME;
-       attr[0].val = "resource-type";
-       attr[1].attr = HTML_ATTR_CONTENT;
-       attr[1].val = "document";
-
-       if ( ! html_aputln(mbuf, ML_OPEN, i, HTML_TAG_META, 2, attr))
-               return(0);
-
-       if ( ! html_tputln(mbuf, ML_OPEN, i, HTML_TAG_TITLE))
-               return(0);
-       if ( ! ml_putstring(mbuf, ts, NULL))
-               return(0);
-       if ( ! html_tputln(mbuf, ML_CLOSE, i, HTML_TAG_TITLE))
-               return(0);
-
-       if (HTML_CSS_EMBED & args->params.html.flags) {
-               attr[0].attr = HTML_ATTR_TYPE;
-               attr[0].val = "text/css";
-
-               if ( ! html_aputln(mbuf, ML_OPEN, i, 
-                                       HTML_TAG_STYLE, 1, attr))
-                       return(0);
-               if ( ! html_commentput(mbuf, ML_OPEN, NULL))
-                       return(0);
-
-               if ( ! html_loadcss(mbuf, args->params.html.css))
-                       return(0);
-
-               if ( ! html_commentput(mbuf, ML_CLOSE, NULL))
-                       return(0);
-               if ( ! html_tputln(mbuf, ML_CLOSE, i, HTML_TAG_STYLE))
-                       return(0);
-       } else {
-               attr[0].attr = HTML_ATTR_REL;
-               attr[0].val = "stylesheet";
-               attr[1].attr = HTML_ATTR_TYPE;
-               attr[1].val = "text/css";
-               attr[2].attr = HTML_ATTR_HREF;
-               attr[2].val = args->params.html.css;
-
-               if ( ! html_aputln(mbuf, ML_OPEN, i,
-                                       HTML_TAG_LINK, 3, attr))
-                       return(0);
        }
        }
-
-       if ( ! html_tputln(mbuf, ML_CLOSE, --i, HTML_TAG_HEAD))
-               return(0);
-       if ( ! html_tputln(mbuf, ML_OPEN, i, HTML_TAG_BODY))
-               return(0);
-
-       attr[0].attr = HTML_ATTR_CLASS;
-       attr[0].val = "mdoc";
-
-       if ( ! html_aputln(mbuf, ML_OPEN, i, HTML_TAG_DIV, 1, attr))
-               return(0);
-
-       attr[0].attr = HTML_ATTR_WIDTH;
-       attr[0].val = "100%";
-       attr[1].attr = HTML_ATTR_CLASS;
-       attr[1].val = "header-table";
-
-       if ( ! html_aputln(mbuf, ML_OPEN, i++, HTML_TAG_TABLE, 2, attr))
-               return(0);
-       if ( ! html_tputln(mbuf, ML_OPEN, i++, HTML_TAG_TR))
-               return(0);
-
-       attr[0].attr = HTML_ATTR_ALIGN;
-       attr[0].val = "left";
-       attr[1].attr = HTML_ATTR_CLASS;
-       attr[1].val = "header-section";
-
-       if ( ! html_aputln(mbuf, ML_OPEN, i, HTML_TAG_TD, 2, attr))
-               return(0);
-       if ( ! ml_putstring(mbuf, ts, NULL))
-               return(0);
-       if ( ! html_tputln(mbuf, ML_CLOSE, i, HTML_TAG_TD))
-               return(0);
-
-       attr[0].attr = HTML_ATTR_ALIGN;
-       attr[0].val = "center";
-       attr[1].attr = HTML_ATTR_CLASS;
-       attr[1].val = "header-volume";
-
-       if ( ! html_aputln(mbuf, ML_OPEN, i, HTML_TAG_TD, 2, attr))
-               return(0);
-       if ( ! ml_putstring(mbuf, title, NULL))
-               return(0);
-       if ( ! html_tputln(mbuf, ML_CLOSE, i, HTML_TAG_TD))
-               return(0);
-
-       attr[0].attr = HTML_ATTR_ALIGN;
-       attr[0].val = "right";
-       attr[1].attr = HTML_ATTR_CLASS;
-       attr[1].val = "header-section";
-
-       if ( ! html_aputln(mbuf, ML_OPEN, i, HTML_TAG_TD, 2, attr))
-               return(0);
-       if ( ! ml_putstring(mbuf, ts, NULL))
-               return(0);
-       if ( ! html_tputln(mbuf, ML_CLOSE, i, HTML_TAG_TD))
-               return(0);
-
-       if ( ! html_tputln(mbuf, ML_CLOSE, --i, HTML_TAG_TR))
-               return(0);
-       return(html_tputln(mbuf, ML_CLOSE, --i, HTML_TAG_TABLE));
+       return had;
 }
 
 }
 
-
-/* ARGSUSED */
-static int 
-html_end(struct md_mbuf *mbuf, const struct md_args *args,
-               const struct tm *tm, const char *os, 
-               const char *name, enum roffmsec msec, enum roffvol vol)
+char *
+html_make_id(const struct roff_node *n, int unique)
 {
 {
-       struct html_pair attr[4];
-       int              i;
-       char             ts[64];
-
-       if (0 == strftime(ts, sizeof(ts), "%B %d, %Y", tm)) {
-               warn("strftime");
-               return(0);
-       }
-
-       i = 0;
-
-       attr[0].attr = HTML_ATTR_WIDTH;
-       attr[0].val = "100%";
-       attr[1].attr = HTML_ATTR_CLASS;
-       attr[1].val = "header-footer";
-
-       if ( ! html_aputln(mbuf, ML_OPEN, i++, HTML_TAG_TABLE, 2, attr))
-               return(0);
-       if ( ! html_tputln(mbuf, ML_OPEN, i++, HTML_TAG_TR))
-               return(0);
-
-       attr[0].attr = HTML_ATTR_ALIGN;
-       attr[0].val = "left";
-       attr[1].attr = HTML_ATTR_CLASS;
-       attr[1].val = "footer-os";
-
-       if ( ! html_aputln(mbuf, ML_OPEN, i, HTML_TAG_TD, 2, attr))
-               return(0);
-       if ( ! ml_putstring(mbuf, os, NULL))
-               return(0);
-       if ( ! html_tputln(mbuf, ML_CLOSE, i, HTML_TAG_TD))
-               return(0);
-
-       attr[0].attr = HTML_ATTR_ALIGN;
-       attr[0].val = "right";
-       attr[1].attr = HTML_ATTR_CLASS;
-       attr[1].val = "footer-date";
-
-       if ( ! html_aputln(mbuf, ML_OPEN, i, HTML_TAG_TD, 2, attr))
-               return(0);
-       if ( ! ml_putstring(mbuf, ts, NULL))
-               return(0);
-       if ( ! html_tputln(mbuf, ML_CLOSE, i, HTML_TAG_TD))
-               return(0);
-
-       if ( ! html_tputln(mbuf, ML_CLOSE, --i, HTML_TAG_TR))
-               return(0);
-       if ( ! html_tputln(mbuf, ML_CLOSE, --i, HTML_TAG_TABLE))
-               return(0);
-
-       if ( ! html_tputln(mbuf, ML_CLOSE, 0, HTML_TAG_DIV))
-               return(0);
-       if ( ! html_tputln(mbuf, ML_CLOSE, 0, HTML_TAG_BODY))
-               return(0);
-       return(html_tputln(mbuf, ML_CLOSE, 0, HTML_TAG_HTML));
-}
+       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;
 
 
-/* ARGSUSED */
-static int
-html_bodytagname(struct md_mbuf *mbuf, 
-               const struct md_args *args, int tok, struct htmlq *q, 
-               const int *argc, const char **argv, size_t *res)
-{
-
-       switch (tok) {
-       case (ROFF_Bl):
-               return(html_Bl_bodytagname(mbuf, q, argc, argv, res));
-       case (ROFF_Fo):
-               return(html_stput(mbuf, HTML_TAG_SPAN, res));
-       case (ROFF_It):
-               return(html_It_bodytagname(mbuf, q, argc, argv, res));
-       case (ROFF_Oo):
-               return(html_stput(mbuf, HTML_TAG_SPAN, res));
-       default:
-               break;
+       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;
        }
        }
-
-       return(html_stput(mbuf, HTML_TAG_DIV, res));
+       ohash_insert(&id_unique, slot, buf);
+       return buf;
 }
 
 }
 
-
-/* ARGSUSED */
 static int
 static int
-html_headtagname(struct md_mbuf *mbuf, 
-               const struct md_args *args, int tok, struct htmlq *q, 
-               const int *argc, const char **argv, size_t *res)
+print_escape(struct html *h, char c)
 {
 
 {
 
-       switch (tok) {
-       case (ROFF_It):
-               return(html_It_headtagname(mbuf, q, argc, argv, res));
-       case (ROFF_Fo):
-               /* FALLTHROUGH */
-       case (ROFF_Oo):
-               return(html_stput(mbuf, HTML_TAG_SPAN, res));
-       case (ROFF_Sh):
-               return(html_stput(mbuf, HTML_TAG_H1, res));
-       case (ROFF_Ss):
-               return(html_stput(mbuf, HTML_TAG_H2, res));
-       default:
+       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;
                break;
+       case ASCII_HYPH:
+               print_byte(h, '-');
+               break;
+       case ASCII_BREAK:
+               break;
+       default:
+               return 0;
        }
        }
-
-       return(html_stput(mbuf, HTML_TAG_DIV, res));
+       return 1;
 }
 
 }
 
-
-/* ARGSUSED */
 static int
 static int
-html_blocktagname(struct md_mbuf *mbuf, const struct md_args *args, 
-               int tok, struct htmlq *q, const int *argc, 
-               const char **argv, size_t *res)
+print_encode(struct html *h, const char *p, const char *pend, int norecurse)
 {
 {
+       char             numbuf[16];
+       const char      *seq;
+       size_t           sz;
+       int              c, len, breakline, nospace;
+       enum mandoc_esc  esc;
+       static const char rejs[10] = { ' ', '\\', '<', '>', '&', '"',
+               ASCII_NBRSP, ASCII_HYPH, ASCII_BREAK, '\0' };
+
+       if (pend == NULL)
+               pend = strchr(p, '\0');
+
+       breakline = 0;
+       nospace = 0;
+
+       while (p < pend) {
+               if (HTML_SKIPCHAR & h->flags && '\\' != *p) {
+                       h->flags &= ~HTML_SKIPCHAR;
+                       p++;
+                       continue;
+               }
 
 
-       switch (tok) {
-       case (ROFF_Fo):
-               /* FALLTHROUGH */
-       case (ROFF_Oo):
-               return(html_stput(mbuf, HTML_TAG_SPAN, res));
-       case (ROFF_It):
-               return(html_It_blocktagname(mbuf, q, argc, argv, res));
-       default:
-               break;
-       }
+               for (sz = strcspn(p, rejs); sz-- && p < pend; p++)
+                       print_byte(h, *p);
 
 
-       return(html_stput(mbuf, HTML_TAG_DIV, res));
-}
+               if (breakline &&
+                   (p >= pend || *p == ' ' || *p == ASCII_NBRSP)) {
+                       print_otag(h, TAG_BR, "");
+                       breakline = 0;
+                       while (p < pend && (*p == ' ' || *p == ASCII_NBRSP))
+                               p++;
+                       continue;
+               }
 
 
+               if (p >= pend)
+                       break;
 
 
-/* ARGSUSED */
-static int
-html_printargs(struct md_mbuf *mbuf, int tok, const char *ns,
-               const int *argc, const char **argv, size_t *res)
-{
+               if (*p == ' ') {
+                       print_endword(h);
+                       p++;
+                       continue;
+               }
 
 
-       /* FIXME: use API in ml.h. */
-
-       if ( ! ml_puts(mbuf, " class=\"", res))
-               return(0);
-       if ( ! ml_puts(mbuf, ns, res))
-               return(0);
-       if ( ! ml_puts(mbuf, "-", res))
-               return(0);
-       if ( ! ml_puts(mbuf, toknames[tok], res))
-               return(0);
-       return(ml_puts(mbuf, "\"", res));
-}
+               if (print_escape(h, *p++))
+                       continue;
+
+               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:
+                       break;
+               }
 
 
+               if (h->flags & HTML_SKIPCHAR) {
+                       h->flags &= ~HTML_SKIPCHAR;
+                       continue;
+               }
 
 
-/* ARGSUSED */
-static int
-html_headtagargs(struct md_mbuf *mbuf, 
-               const struct md_args *args, int tok, 
-               const int *argc, const char **argv, size_t *res)
-{
+               switch (esc) {
+               case ESCAPE_UNICODE:
+                       /* Skip past "u" header. */
+                       c = mchars_num2uc(seq + 1, len - 1);
+                       break;
+               case ESCAPE_NUMBERED:
+                       c = mchars_num2char(seq, len);
+                       if (c < 0)
+                               continue;
+                       break;
+               case ESCAPE_SPECIAL:
+                       c = mchars_spec2cp(seq, len);
+                       if (c <= 0)
+                               continue;
+                       break;
+               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;
+               default:
+                       continue;
+               }
+               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);
+       }
 
 
-       return(html_printargs(mbuf, tok, "head", argc, argv, res));
+       return nospace;
 }
 
 }
 
-
-/* ARGSUSED */
-static int
-html_bodytagargs(struct md_mbuf *mbuf, 
-               const struct md_args *args, int tok, 
-               const int *argc, const char **argv, size_t *res)
+static void
+print_href(struct html *h, const char *name, const char *sec, int man)
 {
 {
-
-       return(html_printargs(mbuf, tok, "body", argc, argv, res));
+       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 (*pp != '\0')
+               print_encode(h, pp, NULL, 1);
 }
 
 }
 
-
-/* ARGSUSED */
-static int
-html_blocktagargs(struct md_mbuf *mbuf, 
-               const struct md_args *args, int tok, 
-               const int *argc, const char **argv, size_t *res)
+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;
 
 
-       return(html_printargs(mbuf, tok, "block", argc, argv, res));
-}
+       tflags = htmltags[tag].flags;
 
 
+       /* Flow content is not allowed in phrasing context. */
 
 
-/* ARGSUSED */
-static int
-html_inlinetagargs(struct md_mbuf *mbuf, 
-               const struct md_args *args, int tok, 
-               const int *argc, const char **argv, size_t *res)
-{
+       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;
+               }
 
 
-       if ( ! html_printargs(mbuf, tok, "inline", argc, argv, res))
-               return(0);
+       /*
+        * Always wrap phrasing elements in a paragraph
+        * unless already contained in some flow container;
+        * never put them directly into a section.
+        */
 
 
-       switch (tok) {
-       case (ROFF_Sx):
+       } else if (tflags & HTML_TOPHRASE && h->tag->tag == TAG_SECTION)
+               print_otag(h, TAG_P, "c", "Pp");
 
 
-               /* FIXME: use API in ml.h. */
+       /* Push this tag onto the stack of open scopes. */
 
 
-               assert(*argv);
-               if ( ! ml_nputs(mbuf, " href=\"#", 8, res))
-                       return(0);
-               if ( ! ml_putstring(mbuf, *argv, res))
-                       return(0);
-               if ( ! ml_nputs(mbuf, "\"", 1, res))
-                       return(0);
-               break;
-       default:
-               break;
+       if ((tflags & HTML_NOSTACK) == 0) {
+               t = mandoc_malloc(sizeof(struct tag));
+               t->tag = tag;
+               t->next = h->tag;
+               t->refcnt = 0;
+               t->closed = 0;
+               h->tag = t;
+       } else
+               t = NULL;
+
+       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);
+               }
        }
        }
-       
-       return(1);
-}
 
 
+       if ( ! (h->flags & HTML_NONOSPACE))
+               h->flags &= ~HTML_NOSPACE;
+       else
+               h->flags |= HTML_NOSPACE;
 
 
-/* ARGSUSED */
-static int
-html_inlinetagname(struct md_mbuf *mbuf, 
-               const struct md_args *args, int tok, size_t *res)
-{
+       /* Print out the tag name and attributes. */
 
 
-       switch (tok) {
-       case (ROFF_Pp):
-               return(html_stput(mbuf, HTML_TAG_DIV, res));
-       case (ROFF_Sx):
-               return(html_stput(mbuf, HTML_TAG_A, res));
-       default:
-               break;
-       }
-
-       return(html_stput(mbuf, HTML_TAG_SPAN, res));
-}
+       print_byte(h, '<');
+       print_word(h, htmltags[tag].name);
 
 
+       va_start(ap, fmt);
 
 
-static ssize_t 
-html_begintag(struct md_mbuf *mbuf, void *data,
-               const struct md_args *args, enum md_ns ns, 
-               int tok, const int *argc, const char **argv)
-{
-       size_t           res;
-       struct htmlq    *q;
-       struct htmlnode *node;
-       int              i;
+       while (*fmt != '\0' && *fmt != 's') {
 
 
-       assert(ns != MD_NS_DEFAULT);
-       res = 0;
+               /* Parse attributes and arguments. */
 
 
-       assert(data);
-       q = (struct htmlq *)data;
+               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;
+
+               /* Print the attributes. */
+
+               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:
+                       print_encode(h, arg1, NULL, 1);
+                       break;
+               }
+               print_byte(h, '"');
+       }
 
 
-       if (NULL == (node = calloc(1, sizeof(struct htmlnode)))) {
-               warn("calloc");
-               return(-1);
+       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, '"');
 
 
-       node->parent = q->last;
-       node->tok = tok;
-       node->ns = ns;
+       va_end(ap);
 
 
-       if (argc)  {
-               /* TODO: argv. */
+       /* Accommodate for "well-formed" singleton escaping. */
 
 
-               assert(argv);
-               /* LINTED */
-               for (i = 0; ROFF_ARGMAX != argc[i]
-                               && i < ROFF_MAXLINEARG; i++) 
-                       node->argc[i] = argc[i];
-               assert(i != ROFF_MAXLINEARG);
-       } 
+       if (htmltags[tag].flags & HTML_NOSTACK)
+               print_byte(h, '/');
 
 
+       print_byte(h, '>');
 
 
-       q->last = node;
+       if (tflags & HTML_NLBEGIN)
+               print_endline(h);
+       else
+               h->flags |= HTML_NOSPACE;
 
 
-       switch (ns) {
-       case (MD_NS_BLOCK):
-               if ( ! html_blocktagname(mbuf, args, tok, 
-                                       q, argc, argv, &res))
-                       return(-1);
-               if ( ! html_blocktagargs(mbuf, args, tok, 
-                                       argc, argv, &res))
-                       return(-1);
-               break;
-       case (MD_NS_BODY):
-               if ( ! html_bodytagname(mbuf, args, tok, 
-                                       q, argc, argv, &res))
-                       return(-1);
-               if ( ! html_bodytagargs(mbuf, args, tok, 
-                                       argc, argv, &res))
-                       return(-1);
-               break;
-       case (MD_NS_HEAD):
-               if ( ! html_headtagname(mbuf, args, tok, q,
-                                       argc, argv, &res))
-                       return(-1);
-               if ( ! html_headtagargs(mbuf, args, tok, 
-                                       argc, argv, &res))
-                       return(-1);
-               break;
-       default:
-               if ( ! html_inlinetagname(mbuf, args, tok, &res))
-                       return(-1);
-               if ( ! html_inlinetagargs(mbuf, args, tok, 
-                                       argc, argv, &res))
-                       return(-1);
-               break;
-       }
+       if (tflags & HTML_INDENT)
+               h->indent++;
+       if (tflags & HTML_NOINDENT)
+               h->noindent++;
 
 
-       return((ssize_t)res);
+       return t;
 }
 
 }
 
-
-static ssize_t 
-html_endtag(struct md_mbuf *mbuf, void *data,
-               const struct md_args *args, enum md_ns ns, int tok)
+static void
+print_ctag(struct html *h, struct tag *tag)
 {
 {
-       size_t           res;
-       struct htmlq    *q;
-       struct htmlnode *node;
-
-       assert(ns != MD_NS_DEFAULT);
-       res = 0;
-
-       assert(data);
-       q = (struct htmlq *)data;
-       node = q->last;
-
-       switch (ns) {
-       case (MD_NS_BLOCK):
-               if ( ! html_blocktagname(mbuf, args, tok, 
-                                       q, node->argc, 
-                                       (const char **)node->argv, &res))
-                       return(-1);
-               break;
-       case (MD_NS_BODY):
-               if ( ! html_bodytagname(mbuf, args, tok, 
-                                       q, node->argc, 
-                                       (const char **)node->argv, &res))
-                       return(-1);
-               break;
-       case (MD_NS_HEAD):
-               if ( ! html_headtagname(mbuf, args, tok, 
-                                       q, node->argc,
-                                       (const char **)node->argv, &res))
-                       return(-1);
-               break;
-       default:
-               if ( ! html_inlinetagname(mbuf, args, tok, &res))
-                       return(-1);
-               break;
+       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);
        }
        }
-
-       q->last = node->parent;
-
-       free(node);
-
-       return((ssize_t)res);
 }
 
 }
 
-
-static int
-html_alloc(void **p)
+void
+print_gen_decls(struct html *h)
 {
 {
+       print_word(h, "<!DOCTYPE html>");
+       print_endline(h);
+}
 
 
-       if (NULL == (*p = calloc(1, sizeof(struct htmlq)))) {
-               warn("calloc");
-               return(0);
+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;
        }
        }
-       return(1);
+       if (wantblank)
+               print_endline(h);
+       print_word(h, " -->");
+       print_endline(h);
+       h->indent = 0;
 }
 
 }
 
-
-static void
-html_free(void *p)
+void
+print_text(struct html *h, const char *word)
 {
 {
-       struct htmlq    *q;
-       struct htmlnode *n;
+       /*
+        * 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");
+
+       /* Output whitespace before this text? */
+
+       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;");
+       }
 
 
-       assert(p);
-       q = (struct htmlq *)p;
+       /*
+        * 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;
 
 
-       /* LINTED */
-       while ((n = q->last)) {
-               q->last = n->parent;
-               free(n);
+       if (h->metaf != NULL) {
+               print_tagq(h, h->metaf);
+               h->metaf = NULL;
        }
 
        }
 
-       free(q);
+       h->flags &= ~HTML_IGNDELIM;
 }
 
 }
 
-
-static ssize_t 
-html_beginhttp(struct md_mbuf *mbuf, 
-               const struct md_args *args, 
-               const char *buf, size_t sz)
+void
+print_tagq(struct html *h, const struct tag *until)
 {
 {
-       size_t           res;
-       struct html_pair pair;
+       struct tag      *this, *next;
 
 
-       res = 0;
-       pair.attr = HTML_ATTR_HREF;
-       pair.val = (char *)buf;
-
-       if ( ! html_aput(mbuf, ML_OPEN, HTML_TAG_A, &res, 1, &pair))
-               return(-1);
-       return((ssize_t)res);
+       for (this = h->tag; this != NULL; this = next) {
+               next = this == until ? NULL : this->next;
+               print_ctag(h, this);
+       }
 }
 
 }
 
-
-static ssize_t 
-html_endhttp(struct md_mbuf *mbuf, 
-               const struct md_args *args, 
-               const char *buf, size_t sz)
+/*
+ * 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)
 {
 {
-       size_t           res;
+       struct tag      *this, *next;
 
 
-       res = 0;
-       if ( ! html_tput(mbuf, ML_CLOSE, HTML_TAG_A, &res))
-               return(-1);
-       return((ssize_t)res);
+       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);
+       }
 }
 
 
 }
 
 
-/* ARGSUSED */
-static ssize_t 
-html_beginstring(struct md_mbuf *mbuf, 
-               const struct md_args *args, 
-               const char *buf, size_t sz)
+/***********************************************************************
+ * Low level output functions.
+ * They implement line breaking using a short static buffer.
+ ***********************************************************************/
+
+/*
+ * 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
+print_byte(struct html *h, char c)
 {
 {
+       if ((h->flags & HTML_BUFFER) == 0) {
+               putchar(c);
+               h->col++;
+               return;
+       }
 
 
-       if (0 == strncmp(buf, "http://", 7))
-               return(html_beginhttp(mbuf, args, buf, sz));
+       if (h->col + h->bufcol < sizeof(h->buf)) {
+               h->buf[h->bufcol++] = c;
+               return;
+       }
 
 
-       return(0);
+       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 ssize_t 
-html_endstring(struct md_mbuf *mbuf, 
-               const struct md_args *args, 
-               const char *buf, size_t sz)
+/*
+ * 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 (0 == strncmp(buf, "http://", 7))
-               return(html_endhttp(mbuf, args, buf, sz));
+       if (h->col == 0)
+               return;
 
 
-       return(0);
+       if (h->bufcol) {
+               putchar(' ');
+               fwrite(h->buf, h->bufcol, 1, stdout);
+               h->bufcol = 0;
+       }
+       putchar('\n');
+       h->col = 0;
+       h->flags |= HTML_NOSPACE;
+       h->flags &= ~HTML_BUFFER;
 }
 
 }
 
-
-int
-md_line_html(void *data, char *buf)
+/*
+ * Flush the HTML output buffer.
+ * If it is inactive, activate it.
+ */
+static void
+print_endword(struct html *h)
 {
 {
+       if (h->noindent) {
+               print_byte(h, ' ');
+               return;
+       }
 
 
-       return(mlg_line((struct md_mlg *)data, buf));
+       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;
+       }
+       h->bufcol = 0;
 }
 
 }
 
-
-int
-md_exit_html(void *data, int flush)
+/*
+ * 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
+print_indent(struct html *h)
 {
 {
+       size_t   i;
 
 
-       return(mlg_exit((struct md_mlg *)data, flush));
-}
+       if (h->col || h->noindent)
+               return;
 
 
+       h->col = h->indent * 2;
+       for (i = 0; i < h->col; i++)
+               putchar(' ');
+}
 
 
-void *
-md_init_html(const struct md_args *args,
-               struct md_mbuf *mbuf, const struct md_rbuf *rbuf)
+/*
+ * Print or buffer some characters
+ * depending on the current HTML output buffer state.
+ */
+static void
+print_word(struct html *h, const char *cp)
 {
 {
-       struct ml_cbs    cbs;
-
-       cbs.ml_alloc = html_alloc;
-       cbs.ml_free = html_free;
-       cbs.ml_begintag = html_begintag;
-       cbs.ml_endtag = html_endtag;
-       cbs.ml_begin = html_begin;
-       cbs.ml_end = html_end;
-       cbs.ml_beginstring = html_beginstring;
-       cbs.ml_endstring = html_endstring;
-
-       return(mlg_alloc(args, rbuf, mbuf, &cbs));
+       while (*cp != '\0')
+               print_byte(h, *cp++);
 }
 }
A git conversion mirror of mandoc.bsd.lv