]> 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
Correctly print `Lk' arguments in -Tascii. Issue raised by Aldis Berzoja.
[mandoc.git] / html.c
diff --git a/html.c b/html.c
index 87cda22c80fc77bc6773b24852f27b787e876930..24c17fb23a31796569b3355d3e50981f3951efaa 100644 (file)
--- a/html.c
+++ b/html.c
@@ -1,1081 +1,788 @@
-/* $Id: html.c,v 1.26 2008/12/10 17:40:56 kristaps Exp $ */
+/*     $Id: html.c,v 1.110 2010/07/26 22:26:05 kristaps Exp $ */
 /*
 /*
- * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * 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 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.
  */
  */
-#include <sys/param.h>
-#include <sys/stat.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <sys/types.h>
 
 #include <assert.h>
 
 #include <assert.h>
-#include <err.h>
-#include <fcntl.h>
-#include <stdlib.h>
+#include <ctype.h>
+#include <stdarg.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.h"
+#include "out.h"
+#include "chars.h"
 #include "html.h"
 #include "html.h"
-#include "ml.h"
-
-/* TODO: allow head/tail-less invocations (just "div" start). */
+#include "main.h"
+
+struct htmldata {
+       const char       *name;
+       int               flags;
+#define        HTML_CLRLINE     (1 << 0)
+#define        HTML_NOSTACK     (1 << 1)
+#define        HTML_AUTOCLOSE   (1 << 2) /* Tag has auto-closure. */
+};
 
 
-struct htmlnode {
-       int              tok;
-       enum md_ns       ns;
-       int              argc[ROFF_MAXLINEARG];
-       char            *argv[ROFF_MAXLINEARG];
-       struct htmlnode *parent;
+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 | HTML_AUTOCLOSE}, /* TAG_META */
+       {"title",       HTML_CLRLINE}, /* TAG_TITLE */
+       {"div",         HTML_CLRLINE}, /* TAG_DIV */
+       {"h1",          0}, /* TAG_H1 */
+       {"h2",          0}, /* TAG_H2 */
+       {"span",        0}, /* TAG_SPAN */
+       {"link",        HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* TAG_LINK */
+       {"br",          HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* TAG_BR */
+       {"a",           0}, /* TAG_A */
+       {"table",       HTML_CLRLINE}, /* TAG_TABLE */
+       {"col",         HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* 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 */
 };
 
 };
 
-struct htmlq {
-       struct htmlnode *last;
+static const char      *const htmlfonts[HTMLFONT_MAX] = {
+       "roman",
+       "bold",
+       "italic"
 };
 
 };
 
+static const char      *const htmlattrs[ATTR_MAX] = {
+       "http-equiv",
+       "content",
+       "name",
+       "rel",
+       "href",
+       "type",
+       "media",
+       "class",
+       "style",
+       "width",
+       "valign",
+       "target",
+       "id",
+       "summary",
+};
 
 
-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 ml_args *, 
-                               enum md_ns, int);
-static ssize_t         html_beginstring(struct ml_args *, 
-                               const char *, size_t);
-static ssize_t         html_endstring(struct ml_args *,
-                               const char *, size_t);
-static ssize_t         html_begintag(struct ml_args *, 
-                               enum md_ns, int,
-                               const int *, const char **);
-static int             html_begin(struct ml_args *,
-                               const struct tm *, 
-                               const char *, const char *, 
-                               enum roffmsec, enum roffvol);
-static int             html_end(struct ml_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 ssize_t         html_beginhttp(struct md_mbuf *, 
-                               const struct md_args *, 
-                               const char *, size_t);
-static ssize_t         html_endhttp(struct md_mbuf *, 
-                               const struct md_args *, 
+static void              print_spec(struct html *, enum roffdeco,
                                const char *, size_t);
                                const char *, size_t);
-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)
+static void              print_res(struct html *, const char *, size_t);
+static void              print_ctag(struct html *, enum htmltag);
+static void              print_doctype(struct html *);
+static void              print_xmltype(struct html *);
+static int               print_encode(struct html *, const char *, int);
+static void              print_metaf(struct html *, enum roffdeco);
+static void              print_attr(struct html *, 
+                               const char *, const char *);
+static void             *ml_alloc(char *, enum htmltype);
+
+
+static void *
+ml_alloc(char *outopts, enum htmltype type)
 {
 {
-       struct htmlnode *n;
-       int              i;
-       struct html_pair attr[2];
-
-       for (n = q->last; n; n = n->parent)
-               if (n->tok == ROFF_Bl)
-                       break;
+       struct html     *h;
+       const char      *toks[4];
+       char            *v;
+
+       toks[0] = "style";
+       toks[1] = "man";
+       toks[2] = "includes";
+       toks[3] = NULL;
+
+       h = calloc(1, sizeof(struct html));
+       if (NULL == h) {
+               perror(NULL);
+               exit(EXIT_FAILURE);
+       }
 
 
-       assert(n);
+       h->type = type;
+       h->tags.head = NULL;
+       h->ords.head = NULL;
+       h->symtab = chars_init(CHARS_HTML);
 
 
-       /* 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):
-                       attr[0].attr = HTML_ATTR_VALIGN;
-                       attr[0].val = "top";
-                       attr[1].attr = HTML_ATTR_NOWRAP;
-                       attr[1].val = "true";
-                       return(html_saput(mbuf, HTML_TAG_TD, 
-                                               res, 2, attr));
-               case (ROFF_Column): 
-                       attr[0].attr = HTML_ATTR_VALIGN;
-                       attr[0].val = "top";
-                       return(html_saput(mbuf, HTML_TAG_TD, 
-                                               res, 1, attr));
+       while (outopts && *outopts)
+               switch (getsubopt(&outopts, UNCONST(toks), &v)) {
+               case (0):
+                       h->style = v;
+                       break;
+               case (1):
+                       h->base_man = v;
+                       break;
+               case (2):
+                       h->base_includes = v;
+                       break;
                default:
                        break;
                }
                default:
                        break;
                }
-       }
 
 
-       return(0);
+       return(h);
 }
 
 }
 
-
-/* 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(char *outopts)
 {
 {
-       struct htmlnode *n;
-       int              i;
-       struct html_pair attr[1];
-
-       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_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): 
-                       attr[0].attr = HTML_ATTR_VALIGN;
-                       attr[0].val = "top";
-                       return(html_saput(mbuf, HTML_TAG_TD, 
-                                               res, 1, attr));
-               default:
-                       break;
-               }
-       }
 
 
-       assert(i != ROFF_MAXLINEARG);
-       return(0);
+       return(ml_alloc(outopts, HTML_HTML_4_01_STRICT));
 }
 
 
 }
 
 
-/* ARGSUSED */
-static int
-html_Bl_bodytagname(struct md_mbuf *mbuf, struct htmlq *q, 
-               const int *argc, const char **argv, size_t *res)
+void *
+xhtml_alloc(char *outopts)
 {
 {
-       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;
-               }
-       }
-
-       assert(i != ROFF_MAXLINEARG);
-       return(0);
+       return(ml_alloc(outopts, HTML_XHTML_1_0_STRICT));
 }
 
 
 }
 
 
-/* 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;
+       struct tag      *tag;
+       struct ord      *ord;
+       struct html     *h;
 
 
-       for (n = q->last; n; n = n->parent)
-               if (n->tok == ROFF_Bl)
-                       break;
+       h = (struct html *)p;
 
 
-       assert(n);
+       while ((ord = h->ords.head) != NULL) { 
+               h->ords.head = ord->next;
+               free(ord);
+       }
 
 
-       /* 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;
-               }
+       while ((tag = h->tags.head) != NULL) {
+               h->tags.head = tag->next;       
+               free(tag);
        }
        }
+       
+       if (h->symtab)
+               chars_free(h->symtab);
 
 
-       assert(i != ROFF_MAXLINEARG);
-       return(0);
+       free(h);
 }
 
 
 }
 
 
-static int
-html_loadcss(struct md_mbuf *mbuf, const char *css)
+void
+print_gen_head(struct html *h)
 {
 {
-       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;
-       }
-
-       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;
+       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);
        }
        }
+}
 
 
-       c = 1;
 
 
-out:
-       if (-1 == close(fd)) {
-               warn("%s", css);
-               c = 0;
-       }
+static void
+print_spec(struct html *h, enum roffdeco d, const char *p, size_t len)
+{
+       int              cp;
+       const char      *rhs;
+       size_t           sz;
+
+       if ((cp = chars_spec2cp(h->symtab, p, len)) > 0) {
+               printf("&#%d;", cp);
+               return;
+       } else if (-1 == cp && DECO_SSPECIAL == d) {
+               fwrite(p, 1, len, stdout);
+               return;
+       } else if (-1 == cp)
+               return;
+
+       if (NULL != (rhs = chars_spec2str(h->symtab, p, len, &sz)))
+               fwrite(rhs, 1, sz, stdout);
+}
 
 
-       if (buf)
-               free(buf);
 
 
-       return(c);
+static void
+print_res(struct html *h, const char *p, size_t len)
+{
+       int              cp;
+       const char      *rhs;
+       size_t           sz;
+
+       if ((cp = chars_res2cp(h->symtab, p, len)) > 0) {
+               printf("&#%d;", cp);
+               return;
+       } else if (-1 == cp)
+               return;
+
+       if (NULL != (rhs = chars_res2str(h->symtab, p, len, &sz)))
+               fwrite(rhs, 1, sz, stdout);
 }
 
 
 }
 
 
-static int
-html_tputln(struct md_mbuf *mbuf, enum ml_scope scope,
-               int i, enum html_tag tag)
+struct tag *
+print_ofont(struct html *h, enum htmlfont font)
 {
 {
+       struct htmlpair  tag;
+
+       h->metal = h->metac;
+       h->metac = font;
+
+       /* FIXME: DECO_ROMAN should just close out preexisting. */
+
+       if (h->metaf && h->tags.head == h->metaf)
+               print_tagq(h, h->metaf);
 
 
-       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));
+       PAIR_CLASS_INIT(&tag, htmlfonts[font]);
+       h->metaf = print_otag(h, TAG_SPAN, 1, &tag);
+       return(h->metaf);
 }
 
 
 }
 
 
-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)
+static void
+print_metaf(struct html *h, enum roffdeco deco)
 {
 {
+       enum htmlfont    font;
+
+       switch (deco) {
+       case (DECO_PREVIOUS):
+               font = h->metal;
+               break;
+       case (DECO_ITALIC):
+               font = HTMLFONT_ITALIC;
+               break;
+       case (DECO_BOLD):
+               font = HTMLFONT_BOLD;
+               break;
+       case (DECO_ROMAN):
+               font = HTMLFONT_NONE;
+               break;
+       default:
+               abort();
+               /* NOTREACHED */
+       }
 
 
-       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));
+       (void)print_ofont(h, font);
 }
 
 
 }
 
 
-/* ARGSUSED */
-static int 
-html_begin(struct ml_args *p, const struct tm *tm, const char *os, 
-               const char *name, enum roffmsec msec, enum roffvol vol)
+static int
+print_encode(struct html *h, const char *p, int norecurse)
 {
 {
-       enum roffvol     bvol;
-       struct html_pair attr[4];
-       char             ts[32], title[64];
-       int              i;
+       size_t           sz;
+       int              len, nospace;
+       const char      *seq;
+       enum roffdeco    deco;
+       static const char rejs[6] = { '\\', '<', '>', '&', ASCII_HYPH, '\0' };
+
+       nospace = 0;
+
+       for (; *p; p++) {
+               sz = strcspn(p, rejs);
+
+               fwrite(p, 1, sz, stdout);
+               p += /* LINTED */
+                       sz;
+
+               if ('<' == *p) {
+                       printf("&lt;");
+                       continue;
+               } else if ('>' == *p) {
+                       printf("&gt;");
+                       continue;
+               } else if ('&' == *p) {
+                       printf("&amp;");
+                       continue;
+               } else if (ASCII_HYPH == *p) {
+                       /*
+                        * Note: "soft hyphens" aren't graphically
+                        * displayed when not breaking the text; we want
+                        * them to be displayed.
+                        */
+                       /*printf("&#173;");*/
+                       putchar('-');
+                       continue;
+               } else if ('\0' == *p)
+                       break;
 
 
-       (void)snprintf(ts, sizeof(ts), "%s(%s)", 
-                       name, roff_msecname(msec));
+               seq = ++p;
+               len = a2roffdeco(&deco, &seq, &sz);
 
 
-       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;
+               switch (deco) {
+               case (DECO_RESERVED):
+                       print_res(h, seq, sz);
                        break;
                        break;
-               case(ROFF_MSEC_2):
-                       /* FALLTHROUGH */
-               case(ROFF_MSEC_3):
-                       /* FALLTHROUGH */
-               case(ROFF_MSEC_3p):
-                       /* FALLTHROUGH */
-               case(ROFF_MSEC_4):
+               case (DECO_SSPECIAL):
                        /* FALLTHROUGH */
                        /* FALLTHROUGH */
-               case(ROFF_MSEC_5):
-                       bvol = ROFF_VOL_PRM;
+               case (DECO_SPECIAL):
+                       print_spec(h, deco, seq, sz);
                        break;
                        break;
-               case(ROFF_MSEC_8):
-                       bvol = ROFF_VOL_PRM;
-                       break;
-               case(ROFF_MSEC_9):
-                       bvol = ROFF_VOL_KM;
-                       break;
-               case(ROFF_MSEC_UNASS):
+               case (DECO_PREVIOUS):
                        /* FALLTHROUGH */
                        /* FALLTHROUGH */
-               case(ROFF_MSEC_DRAFT):
+               case (DECO_BOLD):
                        /* FALLTHROUGH */
                        /* FALLTHROUGH */
-               case(ROFF_MSEC_PAPER):
-                       bvol = ROFF_VOL_NONE;
+               case (DECO_ITALIC):
+                       /* FALLTHROUGH */
+               case (DECO_ROMAN):
+                       if (norecurse)
+                               break;
+                       print_metaf(h, deco);
                        break;
                default:
                        break;
                default:
-                       abort();
-                       /* NOTREACHED */
+                       break;
                }
 
                }
 
-               (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(p->mbuf, HTML_TYPE_4_01_STRICT, NULL))
-               return(0);
-       if ( ! html_tputln(p->mbuf, ML_OPEN, i, HTML_TAG_HTML))
-               return(0);
-       if ( ! html_tputln(p->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(p->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(p->mbuf, ML_OPEN, i, HTML_TAG_META, 2, attr))
-               return(0);
-
-       if ( ! html_tputln(p->mbuf, ML_OPEN, i, HTML_TAG_TITLE))
-               return(0);
-       if ( ! ml_putstring(p->mbuf, ts, NULL))
-               return(0);
-       if ( ! html_tputln(p->mbuf, ML_CLOSE, i, HTML_TAG_TITLE))
-               return(0);
-
-       if (HTML_CSS_EMBED & p->args->params.html.flags) {
-               attr[0].attr = HTML_ATTR_TYPE;
-               attr[0].val = "text/css";
-
-               if ( ! html_aputln(p->mbuf, ML_OPEN, i, 
-                                       HTML_TAG_STYLE, 1, attr))
-                       return(0);
-               if ( ! html_commentput(p->mbuf, ML_OPEN, NULL))
-                       return(0);
-
-               if ( ! html_loadcss(p->mbuf, p->args->params.html.css))
-                       return(0);
-
-               if ( ! html_commentput(p->mbuf, ML_CLOSE, NULL))
-                       return(0);
-               if ( ! html_tputln(p->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 = p->args->params.html.css;
-
-               if ( ! html_aputln(p->mbuf, ML_OPEN, i,
-                                       HTML_TAG_LINK, 3, attr))
-                       return(0);
+               p += len - 1;
+
+               if (DECO_NOSPACE == deco && '\0' == *(p + 1))
+                       nospace = 1;
        }
 
        }
 
-       if ( ! html_tputln(p->mbuf, ML_CLOSE, --i, HTML_TAG_HEAD))
-               return(0);
-       if ( ! html_tputln(p->mbuf, ML_OPEN, i, HTML_TAG_BODY))
-               return(0);
-
-       attr[0].attr = HTML_ATTR_CLASS;
-       attr[0].val = "mdoc";
-
-       if ( ! html_aputln(p->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(p->mbuf, ML_OPEN, i++, HTML_TAG_TABLE, 2, attr))
-               return(0);
-       if ( ! html_tputln(p->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(p->mbuf, ML_OPEN, i, HTML_TAG_TD, 2, attr))
-               return(0);
-       if ( ! ml_putstring(p->mbuf, ts, NULL))
-               return(0);
-       if ( ! html_tputln(p->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(p->mbuf, ML_OPEN, i, HTML_TAG_TD, 2, attr))
-               return(0);
-       if ( ! ml_putstring(p->mbuf, title, NULL))
-               return(0);
-       if ( ! html_tputln(p->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(p->mbuf, ML_OPEN, i, HTML_TAG_TD, 2, attr))
-               return(0);
-       if ( ! ml_putstring(p->mbuf, ts, NULL))
-               return(0);
-       if ( ! html_tputln(p->mbuf, ML_CLOSE, i, HTML_TAG_TD))
-               return(0);
-
-       if ( ! html_tputln(p->mbuf, ML_CLOSE, --i, HTML_TAG_TR))
-               return(0);
-       return(html_tputln(p->mbuf, ML_CLOSE, --i, HTML_TAG_TABLE));
+       return(nospace);
 }
 
 
 }
 
 
-/* ARGSUSED */
-static int 
-html_end(struct ml_args *p, const struct tm *tm, const char *os, 
-               const char *name, enum roffmsec msec, enum roffvol vol)
+static void
+print_attr(struct html *h, const char *key, const char *val)
 {
 {
-       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(p->mbuf, ML_OPEN, i++, HTML_TAG_TABLE, 2, attr))
-               return(0);
-       if ( ! html_tputln(p->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(p->mbuf, ML_OPEN, i, HTML_TAG_TD, 2, attr))
-               return(0);
-       if ( ! ml_putstring(p->mbuf, os, NULL))
-               return(0);
-       if ( ! html_tputln(p->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(p->mbuf, ML_OPEN, i, HTML_TAG_TD, 2, attr))
-               return(0);
-       if ( ! ml_putstring(p->mbuf, ts, NULL))
-               return(0);
-       if ( ! html_tputln(p->mbuf, ML_CLOSE, i, HTML_TAG_TD))
-               return(0);
-
-       if ( ! html_tputln(p->mbuf, ML_CLOSE, --i, HTML_TAG_TR))
-               return(0);
-       if ( ! html_tputln(p->mbuf, ML_CLOSE, --i, HTML_TAG_TABLE))
-               return(0);
-
-       if ( ! html_tputln(p->mbuf, ML_CLOSE, 0, HTML_TAG_DIV))
-               return(0);
-       if ( ! html_tputln(p->mbuf, ML_CLOSE, 0, HTML_TAG_BODY))
-               return(0);
-       return(html_tputln(p->mbuf, ML_CLOSE, 0, HTML_TAG_HTML));
+       printf(" %s=\"", key);
+       (void)print_encode(h, val, 1);
+       putchar('\"');
 }
 
 
 }
 
 
-/* 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)
+struct tag *
+print_otag(struct html *h, enum htmltag tag, 
+               int sz, const struct htmlpair *p)
 {
 {
+       int              i;
+       struct tag      *t;
 
 
-       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;
-       }
-
-       return(html_stput(mbuf, HTML_TAG_DIV, res));
-}
-
+       /* Push this tags onto the stack of open scopes. */
 
 
-/* ARGSUSED */
-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)
-{
+       if ( ! (HTML_NOSTACK & htmltags[tag].flags)) {
+               t = malloc(sizeof(struct tag));
+               if (NULL == t) {
+                       perror(NULL);
+                       exit(EXIT_FAILURE);
+               }
+               t->tag = tag;
+               t->next = h->tags.head;
+               h->tags.head = t;
+       } else
+               t = NULL;
+
+       if ( ! (HTML_NOSPACE & h->flags))
+               if ( ! (HTML_CLRLINE & htmltags[tag].flags)) {
+                       /* Manage keeps! */
+                       if ( ! (HTML_KEEP & h->flags)) {
+                               if (HTML_PREKEEP & h->flags)
+                                       h->flags |= HTML_KEEP;
+                               putchar(' ');
+                       } else
+                               printf("&#160;");
+               }
 
 
-       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:
-               break;
-       }
+       if ( ! (h->flags & HTML_NONOSPACE))
+               h->flags &= ~HTML_NOSPACE;
+       else
+               h->flags |= HTML_NOSPACE;
 
 
-       return(html_stput(mbuf, HTML_TAG_DIV, res));
-}
+       /* Print out the tag name and attributes. */
 
 
+       printf("<%s", htmltags[tag].name);
+       for (i = 0; i < sz; i++)
+               print_attr(h, htmlattrs[p[i].key], p[i].val);
 
 
-/* ARGSUSED */
-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)
-{
+       /* Add non-overridable attributes. */
 
 
-       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;
+       if (TAG_HTML == tag && HTML_XHTML_1_0_STRICT == h->type) {
+               print_attr(h, "xmlns", "http://www.w3.org/1999/xhtml");
+               print_attr(h, "xml:lang", "en");
+               print_attr(h, "lang", "en");
        }
 
        }
 
-       return(html_stput(mbuf, HTML_TAG_DIV, res));
-}
+       /* Accomodate for XML "well-formed" singleton escaping. */
 
 
+       if (HTML_AUTOCLOSE & htmltags[tag].flags)
+               switch (h->type) {
+               case (HTML_XHTML_1_0_STRICT):
+                       putchar('/');
+                       break;
+               default:
+                       break;
+               }
 
 
-/* ARGSUSED */
-static int
-html_printargs(struct md_mbuf *mbuf, int tok, const char *ns,
-               const int *argc, const char **argv, size_t *res)
-{
+       putchar('>');
 
 
-       /* 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));
+       h->flags |= HTML_NOSPACE;
+       return(t);
 }
 
 
 }
 
 
-/* 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)
+static void
+print_ctag(struct html *h, enum htmltag tag)
 {
 {
-
-       return(html_printargs(mbuf, tok, "head", argc, argv, res));
+       
+       printf("</%s>", htmltags[tag].name);
+       if (HTML_CLRLINE & htmltags[tag].flags) {
+               h->flags |= HTML_NOSPACE;
+               putchar('\n');
+       } 
 }
 
 
 }
 
 
-/* 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)
+void
+print_gen_decls(struct html *h)
 {
 
 {
 
-       return(html_printargs(mbuf, tok, "body", argc, argv, res));
+       print_xmltype(h);
+       print_doctype(h);
 }
 
 
 }
 
 
-/* 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)
+static void
+print_xmltype(struct html *h)
 {
 
 {
 
-       return(html_printargs(mbuf, tok, "block", argc, argv, res));
+       if (HTML_XHTML_1_0_STRICT == h->type)
+               printf("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
 }
 
 
 }
 
 
-/* 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)
+static void
+print_doctype(struct html *h)
 {
 {
-
-       if ( ! html_printargs(mbuf, tok, "inline", argc, argv, res))
-               return(0);
-
-       switch (tok) {
-       case (ROFF_Sh):
-
-               /* FIXME: use API in ml.h. */
-
-               assert(*argv);
-               if ( ! ml_nputs(mbuf, " name=\"", 7, res))
-                       return(0);
-               if ( ! ml_putstring(mbuf, *argv++, res))
-                       return(0);
-               while (*argv) {
-                       if ( ! ml_putstring(mbuf, "_", res))
-                               return(0);
-                       if ( ! ml_putstring(mbuf, *argv++, res))
-                               return(0);
-               }
-               if ( ! ml_nputs(mbuf, "\"", 1, res))
-                       return(0);
-               break;
-
-       case (ROFF_Sx):
-
-               /* FIXME: use API in ml.h. */
-
-               assert(*argv);
-               if ( ! ml_nputs(mbuf, " href=\"#", 8, res))
-                       return(0);
-               if ( ! ml_putstring(mbuf, *argv++, res))
-                       return(0);
-               while (*argv) {
-                       if ( ! ml_putstring(mbuf, "_", res))
-                               return(0);
-                       if ( ! ml_putstring(mbuf, *argv++, res))
-                               return(0);
-               }
-               if ( ! ml_nputs(mbuf, "\"", 1, res))
-                       return(0);
-
-               break;
-       default:
+       const char      *doctype;
+       const char      *dtd;
+       const char      *name;
+
+       switch (h->type) {
+       case (HTML_HTML_4_01_STRICT):
+               name = "HTML";
+               doctype = "-//W3C//DTD HTML 4.01//EN";
+               dtd = "http://www.w3.org/TR/html4/strict.dtd";
                break;
                break;
-       }
-       
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-html_inlinetagname(struct md_mbuf *mbuf, 
-               const struct md_args *args, int tok, size_t *res)
-{
-
-       switch (tok) {
-       case (ROFF_Sh):
-               return(html_stput(mbuf, HTML_TAG_A, res));
-       case (ROFF_Pp):
-               return(html_stput(mbuf, HTML_TAG_DIV, res));
-       case (ROFF_Sx):
-               return(html_stput(mbuf, HTML_TAG_A, res));
        default:
        default:
+               name = "html";
+               doctype = "-//W3C//DTD XHTML 1.0 Strict//EN";
+               dtd = "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";
                break;
        }
 
                break;
        }
 
-       return(html_stput(mbuf, HTML_TAG_SPAN, res));
+       printf("<!DOCTYPE %s PUBLIC \"%s\" \"%s\">\n", 
+                       name, doctype, dtd);
 }
 
 
 }
 
 
-static ssize_t 
-html_begintag(struct ml_args *p, enum md_ns ns, 
-               int tok, const int *argc, const char **argv)
+void
+print_text(struct html *h, const char *word)
 {
 {
-       size_t           res;
-       struct htmlq    *q;
-       struct htmlnode *node;
-       int              i;
-
-       assert(ns != MD_NS_DEFAULT);
-       res = 0;
 
 
-       q = (struct htmlq *)p->data;
+       if (word[0] && '\0' == word[1])
+               switch (word[0]) {
+               case('.'):
+                       /* FALLTHROUGH */
+               case(','):
+                       /* FALLTHROUGH */
+               case(';'):
+                       /* FALLTHROUGH */
+               case(':'):
+                       /* FALLTHROUGH */
+               case('?'):
+                       /* FALLTHROUGH */
+               case('!'):
+                       /* FALLTHROUGH */
+               case(')'):
+                       /* FALLTHROUGH */
+               case(']'):
+                       if ( ! (HTML_IGNDELIM & h->flags))
+                               h->flags |= HTML_NOSPACE;
+                       break;
+               default:
+                       break;
+               }
 
 
-       if (NULL == (node = calloc(1, sizeof(struct htmlnode)))) {
-               warn("calloc");
-               return(-1);
+       if ( ! (HTML_NOSPACE & h->flags)) {
+               /* Manage keeps! */
+               if ( ! (HTML_KEEP & h->flags)) {
+                       if (HTML_PREKEEP & h->flags)
+                               h->flags |= HTML_KEEP;
+                       putchar(' ');
+               } else
+                       printf("&#160;");
        }
 
        }
 
-       node->parent = q->last;
-       node->tok = tok;
-       node->ns = ns;
-
-       if (argc)  {
-               /* TODO: argv. */
-
-               assert(argv);
-               /* LINTED */
-               for (i = 0; ROFF_ARGMAX != argc[i]
-                               && i < ROFF_MAXLINEARG; i++) 
-                       node->argc[i] = argc[i];
-               assert(i != ROFF_MAXLINEARG);
-       } 
-
+       assert(word);
+       if ( ! print_encode(h, word, 0))
+               if ( ! (h->flags & HTML_NONOSPACE))
+                       h->flags &= ~HTML_NOSPACE;
+
+       /* 
+        * Note that we don't process the pipe: the parser sees it as
+        * punctuation, but we don't in terms of typography.
+        */
+       if (word[0] && '\0' == word[1])
+               switch (word[0]) {
+               case('('):
+                       /* FALLTHROUGH */
+               case('['):
+                       h->flags |= HTML_NOSPACE;
+                       break;
+               default:
+                       break;
+               }
+}
 
 
-       q->last = node;
 
 
-       switch (ns) {
-       case (MD_NS_BLOCK):
-               if ( ! html_blocktagname(p->mbuf, p->args, tok, 
-                                       q, argc, argv, &res))
-                       return(-1);
-               if ( ! html_blocktagargs(p->mbuf, p->args, tok, 
-                                       argc, argv, &res))
-                       return(-1);
-               break;
-       case (MD_NS_BODY):
-               if ( ! html_bodytagname(p->mbuf, p->args, tok, 
-                                       q, argc, argv, &res))
-                       return(-1);
-               if ( ! html_bodytagargs(p->mbuf, p->args, tok, 
-                                       argc, argv, &res))
-                       return(-1);
-               break;
-       case (MD_NS_HEAD):
-               if ( ! html_headtagname(p->mbuf, p->args, tok, q,
-                                       argc, argv, &res))
-                       return(-1);
-               if ( ! html_headtagargs(p->mbuf, p->args, tok, 
-                                       argc, argv, &res))
-                       return(-1);
-               break;
-       default:
-               if ( ! html_inlinetagname(p->mbuf, p->args, tok, &res))
-                       return(-1);
-               if ( ! html_inlinetagargs(p->mbuf, p->args, tok, 
-                                       argc, argv, &res))
-                       return(-1);
-               break;
+void
+print_tagq(struct html *h, const struct tag *until)
+{
+       struct tag      *tag;
+
+       while ((tag = h->tags.head) != NULL) {
+               if (tag == h->metaf)
+                       h->metaf = NULL;
+               print_ctag(h, tag->tag);
+               h->tags.head = tag->next;
+               free(tag);
+               if (until && tag == until)
+                       return;
        }
        }
-
-       return((ssize_t)res);
 }
 
 
 }
 
 
-static ssize_t 
-html_endtag(struct ml_args *p, enum md_ns ns, int tok)
+void
+print_stagq(struct html *h, const struct tag *suntil)
 {
 {
-       size_t           res;
-       struct htmlq    *q;
-       struct htmlnode *node;
-
-       assert(ns != MD_NS_DEFAULT);
-       res = 0;
-
-       q = (struct htmlq *)p->data;
-       node = q->last;
-
-       switch (ns) {
-       case (MD_NS_BLOCK):
-               if ( ! html_blocktagname(p->mbuf, p->args, tok, 
-                                       q, node->argc, 
-                                       (const char **)node->argv, &res))
-                       return(-1);
-               break;
-       case (MD_NS_BODY):
-               if ( ! html_bodytagname(p->mbuf, p->args, tok, 
-                                       q, node->argc, 
-                                       (const char **)node->argv, &res))
-                       return(-1);
-               break;
-       case (MD_NS_HEAD):
-               if ( ! html_headtagname(p->mbuf, p->args, tok, 
-                                       q, node->argc,
-                                       (const char **)node->argv, &res))
-                       return(-1);
-               break;
-       default:
-               if ( ! html_inlinetagname(p->mbuf, p->args, tok, &res))
-                       return(-1);
-               break;
+       struct tag      *tag;
+
+       while ((tag = h->tags.head) != NULL) {
+               if (suntil && tag == suntil)
+                       return;
+               if (tag == h->metaf)
+                       h->metaf = NULL;
+               print_ctag(h, tag->tag);
+               h->tags.head = tag->next;
+               free(tag);
        }
        }
+}
 
 
-       q->last = node->parent;
 
 
-       free(node);
+void
+bufinit(struct html *h)
+{
 
 
-       return((ssize_t)res);
+       h->buf[0] = '\0';
+       h->buflen = 0;
 }
 
 
 }
 
 
-static int
-html_alloc(void **p)
+void
+bufcat_style(struct html *h, const char *key, const char *val)
 {
 
 {
 
-       if (NULL == (*p = calloc(1, sizeof(struct htmlq)))) {
-               warn("calloc");
-               return(0);
-       }
-       return(1);
+       bufcat(h, key);
+       bufncat(h, ":", 1);
+       bufcat(h, val);
+       bufncat(h, ";", 1);
 }
 
 
 }
 
 
-static void
-html_free(void *p)
+void
+bufcat(struct html *h, const char *p)
 {
 {
-       struct htmlq    *q;
-       struct htmlnode *n;
 
 
-       assert(p);
-       q = (struct htmlq *)p;
+       bufncat(h, p, strlen(p));
+}
+
 
 
-       /* LINTED */
-       while ((n = q->last)) {
-               q->last = n->parent;
-               free(n);
-       }
+void
+buffmt(struct html *h, const char *fmt, ...)
+{
+       va_list          ap;
 
 
-       free(q);
+       va_start(ap, fmt);
+       (void)vsnprintf(h->buf + (int)h->buflen, 
+                       BUFSIZ - h->buflen - 1, fmt, ap);
+       va_end(ap);
+       h->buflen = strlen(h->buf);
 }
 
 
 }
 
 
-/* ARGSUSED */
-static ssize_t 
-html_beginhttp(struct md_mbuf *mbuf, 
-               const struct md_args *args, 
-               const char *buf, size_t sz)
+void
+bufncat(struct html *h, const char *p, size_t sz)
 {
 {
-       size_t           res;
-       struct html_pair pair;
 
 
-       res = 0;
-       pair.attr = HTML_ATTR_HREF;
-       pair.val = (char *)buf;
+       if (h->buflen + sz > BUFSIZ - 1)
+               sz = BUFSIZ - 1 - h->buflen;
 
 
-       if ( ! html_aput(mbuf, ML_OPEN, HTML_TAG_A, &res, 1, &pair))
-               return(-1);
-       return((ssize_t)res);
+       (void)strncat(h->buf, p, sz);
+       h->buflen += sz;
 }
 
 
 }
 
 
-/* ARGSUSED */
-static ssize_t 
-html_endhttp(struct md_mbuf *mbuf, 
-               const struct md_args *args, 
-               const char *buf, size_t sz)
+void
+buffmt_includes(struct html *h, const char *name)
 {
 {
-       size_t           res;
+       const char      *p, *pp;
 
 
-       res = 0;
-       if ( ! html_tput(mbuf, ML_CLOSE, HTML_TAG_A, &res))
-               return(-1);
-       return((ssize_t)res);
+       pp = h->base_includes;
+       
+       while (NULL != (p = strchr(pp, '%'))) {
+               bufncat(h, pp, (size_t)(p - pp));
+               switch (*(p + 1)) {
+               case('I'):
+                       bufcat(h, name);
+                       break;
+               default:
+                       bufncat(h, p, 2);
+                       break;
+               }
+               pp = p + 2;
+       }
+       if (pp)
+               bufcat(h, pp);
 }
 
 
 }
 
 
-/* ARGSUSED */
-static ssize_t 
-html_beginstring(struct ml_args *p, const char *buf, size_t sz)
+void
+buffmt_man(struct html *h, 
+               const char *name, const char *sec)
 {
 {
+       const char      *p, *pp;
 
 
-       if (0 == strncmp(buf, "http://", 7))
-               return(html_beginhttp(p->mbuf, p->args, buf, sz));
-
-       return(0);
+       pp = h->base_man;
+       
+       /* LINTED */
+       while (NULL != (p = strchr(pp, '%'))) {
+               bufncat(h, pp, (size_t)(p - pp));
+               switch (*(p + 1)) {
+               case('S'):
+                       bufcat(h, sec ? sec : "1");
+                       break;
+               case('N'):
+                       buffmt(h, name);
+                       break;
+               default:
+                       bufncat(h, p, 2);
+                       break;
+               }
+               pp = p + 2;
+       }
+       if (pp)
+               bufcat(h, pp);
 }
 
 
 }
 
 
-/* ARGSUSED */
-static ssize_t 
-html_endstring(struct ml_args *p, const char *buf, size_t sz)
+void
+bufcat_su(struct html *h, const char *p, const struct roffsu *su)
 {
 {
-       
-       if (0 == strncmp(buf, "http://", 7))
-               return(html_endhttp(p->mbuf, p->args, buf, sz));
+       double           v;
+       const char      *u;
+
+       v = su->scale;
 
 
-       return(0);
+       switch (su->unit) {
+       case (SCALE_CM):
+               u = "cm";
+               break;
+       case (SCALE_IN):
+               u = "in";
+               break;
+       case (SCALE_PC):
+               u = "pc";
+               break;
+       case (SCALE_PT):
+               u = "pt";
+               break;
+       case (SCALE_EM):
+               u = "em";
+               break;
+       case (SCALE_MM):
+               if (0 == (v /= 100))
+                       v = 1;
+               u = "em";
+               break;
+       case (SCALE_EN):
+               u = "ex";
+               break;
+       case (SCALE_BU):
+               u = "ex";
+               break;
+       case (SCALE_VS):
+               u = "em";
+               break;
+       default:
+               u = "ex";
+               break;
+       }
+
+       /* 
+        * XXX: the CSS spec isn't clear as to which types accept
+        * integer or real numbers, so we just make them all decimals.
+        */
+       buffmt(h, "%s: %.2f%s;", p, v, u);
 }
 
 
 }
 
 
-int
-md_line_html(void *data, char *buf)
+void
+html_idcat(char *dst, const char *src, int sz)
 {
 {
+       int              ssz;
 
 
-       return(mlg_line((struct md_mlg *)data, buf));
-}
+       assert(sz);
 
 
+       /* Cf. <http://www.w3.org/TR/html4/types.html#h-6.2>. */
 
 
-int
-md_exit_html(void *data, int flush)
-{
+       for ( ; *dst != '\0' && sz; dst++, sz--)
+               /* Jump to end. */ ;
 
 
-       return(mlg_exit((struct md_mlg *)data, flush));
-}
+       assert(sz > 2);
 
 
+       /* We can't start with a number (bah). */
 
 
-void *
-md_init_html(const struct md_args *args,
-               struct md_mbuf *mbuf, const struct md_rbuf *rbuf)
-{
-       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));
+       *dst++ = 'x';
+       *dst = '\0';
+       sz--;
+
+       for ( ; *src != '\0' && sz > 1; src++) {
+               ssz = snprintf(dst, (size_t)sz, "%.2x", *src);
+               sz -= ssz;
+               dst += ssz;
+       }
 }
 }
A git conversion mirror of mandoc.bsd.lv