"Groff allows the initial macro on a line to be delimited by a space of

[mandoc.git] / html.c

diff --git a/html.c b/html.c
index f93ca7641a1fd7a08eb603c0ee307e38fd99d2e2..24c17fb23a31796569b3355d3e50981f3951efaa 100644 (file)
--- a/html.c
+++ b/html.c
@@ -1,773 +1,788 @@
-/* $Id: html.c,v 1.13 2008/12/06 21:10:31 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 "libmdocml.h"
-#include "private.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 "mandoc.h"
+#include "out.h"
+#include "chars.h"
+#include "html.h"
+#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. */

 };
 
 };
 

+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 md_mbuf *, void *,
-                               const struct md_args *, 
-                               enum md_ns, int);
-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 *, 
+static void              print_spec(struct html *, enum roffdeco,
+                               const char *, size_t);
+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 *);
                                const char *, const char *);

-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 *);
-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 *);
-
-
-/* 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;
+static void             *ml_alloc(char *, enum htmltype);

 
 

-       for (n = q->last; n; n = n->parent)
-               if (n->tok == ROFF_Bl)
-                       break;

 
 

-       assert(n);
+static void *
+ml_alloc(char *outopts, enum htmltype type)
+{
+       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);
+       }

 
 

-       /* LINTED */
-       for (i = 0; ROFF_ARGMAX != n->argc[i] &&
-                       i < ROFF_MAXLINEARG; i++) {
-               switch (n->argc[i]) {
-               case (ROFF_Tag):
-                       /* FALLTHROUGH */
-               case (ROFF_Column): 
-                       return(ml_nputs(mbuf, "td", 2, res));
+       h->type = type;
+       h->tags.head = NULL;
+       h->ords.head = NULL;
+       h->symtab = chars_init(CHARS_HTML);
+
+       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;
                }

-       }

 
 

-       assert(i != ROFF_MAXLINEARG);
-       abort();
-       /* NOTREACHED */
+       return(h);
+}

 
 

-       return(1);
+void *
+html_alloc(char *outopts)
+{
+
+       return(ml_alloc(outopts, HTML_HTML_4_01_STRICT));

 }
 
 
 }
 
 

-/* ARGSUSED */
-static int
-html_It_bodytagname(struct md_mbuf *mbuf, struct htmlq *q, 
-               const int *argc, const char **argv, size_t *res)
+void *
+xhtml_alloc(char *outopts)

 {
 {

-       struct htmlnode *n;
-       int              i;

 
 

-       for (n = q->last; n; n = n->parent)
-               if (n->tok == ROFF_Bl)
-                       break;
+       return(ml_alloc(outopts, HTML_XHTML_1_0_STRICT));
+}

 
 

-       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(ml_nputs(mbuf, "div", 3, res));
-               case (ROFF_Tag):
-                       /* FALLTHROUGH */
-               case (ROFF_Column): 
-                       return(ml_nputs(mbuf, "td", 2, res));
-               default:
-                       break;
-               }
+void
+html_free(void *p)
+{
+       struct tag      *tag;
+       struct ord      *ord;
+       struct html     *h;
+
+       h = (struct html *)p;
+
+       while ((ord = h->ords.head) != NULL) { 
+               h->ords.head = ord->next;
+               free(ord);

        }
 
        }
 

-       assert(i != ROFF_MAXLINEARG);
-       abort();
-       /* NOTREACHED */
+       while ((tag = h->tags.head) != NULL) {
+               h->tags.head = tag->next;       
+               free(tag);
+       }
+       
+       if (h->symtab)
+               chars_free(h->symtab);

 
 

-       return(1);
+       free(h);

 }
 
 
 }
 
 

-/* ARGSUSED */
-static int
-html_Bl_bodytagname(struct md_mbuf *mbuf, struct htmlq *q, 
-               const int *argc, const char **argv, size_t *res)
+void
+print_gen_head(struct html *h)

 {
 {

-       int              i;
+       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);
+       }
+}

 
 

-       for (i = 0; ROFF_ARGMAX != argc[i]
-                       && i < ROFF_MAXLINEARG; i++) {
-               switch (argc[i]) {
-               case (ROFF_Enum):
-                       return(ml_nputs(mbuf, "ol", 2, 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(ml_nputs(mbuf, "ul", 2, res));
-               case (ROFF_Tag):
-                       /* FALLTHROUGH */
-               case (ROFF_Column): 
-                       return(ml_nputs(mbuf, "table", 5, res));
-               default:
-                       break;
-               }
+
+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);
+}
+
+
+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);
+}
+
+
+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);
+
+       PAIR_CLASS_INIT(&tag, htmlfonts[font]);
+       h->metaf = print_otag(h, TAG_SPAN, 1, &tag);
+       return(h->metaf);
+}
+
+
+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 */

        }
 
        }
 

-       assert(i != ROFF_MAXLINEARG);
-       abort();
-       /* NOTREACHED */
+       (void)print_ofont(h, font);

 }
 
 
 }
 
 

-/* ARGSUSED */

 static int
 static int

-html_It_blocktagname(struct md_mbuf *mbuf, struct htmlq *q, 
-               const int *argc, const char **argv, size_t *res)
+print_encode(struct html *h, const char *p, int norecurse)

 {
 {

-       struct htmlnode *n;
-       int              i;
-
-       for (n = q->last; n; n = n->parent)
-               if (n->tok == ROFF_Bl)
+       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;
 
                        break;
 

-       assert(n);
+               seq = ++p;
+               len = a2roffdeco(&deco, &seq, &sz);

 
 

-       /* 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):
+               switch (deco) {
+               case (DECO_RESERVED):
+                       print_res(h, seq, sz);
+                       break;
+               case (DECO_SSPECIAL):

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (ROFF_Hang):
+               case (DECO_SPECIAL):
+                       print_spec(h, deco, seq, sz);
+                       break;
+               case (DECO_PREVIOUS):

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (ROFF_Ohang): 
+               case (DECO_BOLD):

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (ROFF_Inset):
-                       return(ml_nputs(mbuf, "li", 2, res));
-               case (ROFF_Tag):
+               case (DECO_ITALIC):

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (ROFF_Column): 
-                       return(ml_nputs(mbuf, "tr", 2, res));
+               case (DECO_ROMAN):
+                       if (norecurse)
+                               break;
+                       print_metaf(h, deco);
+                       break;

                default:
                        break;
                }
                default:
                        break;
                }

+
+               p += len - 1;
+
+               if (DECO_NOSPACE == deco && '\0' == *(p + 1))
+                       nospace = 1;

        }
 
        }
 

-       assert(i != ROFF_MAXLINEARG);
-       abort();
-       /* NOTREACHED */
+       return(nospace);

 }
 
 
 }
 
 

-static int
-html_loadcss(struct md_mbuf *mbuf, const char *css)
+static void
+print_attr(struct html *h, const char *key, const char *val)

 {
 {

-       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;
-       }
+       printf(" %s=\"", key);
+       (void)print_encode(h, val, 1);
+       putchar('\"');
+}

 
 

-       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 tag *
+print_otag(struct html *h, enum htmltag tag, 
+               int sz, const struct htmlpair *p)
+{
+       int              i;
+       struct tag      *t;
+
+       /* Push this tags onto the stack of open scopes. */
+
+       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;");
+               }
+
+       if ( ! (h->flags & HTML_NONOSPACE))
+               h->flags &= ~HTML_NOSPACE;
+       else
+               h->flags |= HTML_NOSPACE;

 
 

-       c = 1;
+       /* Print out the tag name and attributes. */

 
 

-out:
-       if (-1 == close(fd)) {
-               warn("%s", css);
-               c = 0;
+       printf("<%s", htmltags[tag].name);
+       for (i = 0; i < sz; i++)
+               print_attr(h, htmlattrs[p[i].key], p[i].val);
+
+       /* Add non-overridable attributes. */
+
+       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");

        }
 
        }
 

-       if (buf)
-               free(buf);
+       /* 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;
+               }
+
+       putchar('>');

 
 

-       return(c);
+       h->flags |= HTML_NOSPACE;
+       return(t);

 }
 
 
 }
 
 

-/* ARGSUSED */
-static int 
-html_begin(struct md_mbuf *mbuf, const struct md_args *args,
-               const struct tm *tm, const char *os, 
-               const char *title, const char *section, 
-               const char *vol)
+static void
+print_ctag(struct html *h, enum htmltag tag)

 {
 {

-       const char      *preamble, *css, *trail;
-       char             buf[512];
-       size_t           res;
-
-       preamble =
-       "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\"\n"
-       "    \"http://www.w3.org/TR/html4/strict.dtd\">\n"
-       "<html>\n"
-       "<head>\n"
-       "    <meta http-equiv=\"Content-Type\"\n"
-       "         content=\"text/html;charset=utf-8\">\n"
-       "    <meta name=\"resource-type\" content=\"document\">\n"
-       "    <title>Manual Page for %s(%s)</title>\n";
-
-       css = 
-       "    <link rel=\"stylesheet\" type=\"text/css\"\n"
-       "         href=\"%s\">\n";
-       trail = 
-       "</head>\n"
-       "<body>\n"
-       "<div class=\"mdoc\">";
-
-       res = 0;
-
-       (void)snprintf(buf, sizeof(buf) - 1,
-                       preamble, title, section);
-
-       if ( ! ml_puts(mbuf, buf, &res))
-               return(0);
-
-       assert(args->params.html.css);
-       if (HTML_CSS_EMBED & args->params.html.flags) {
-               if ( ! ml_puts(mbuf, "    <style type=\"text/css\"><!--\n", &res))
-                       return(0);
-               if ( ! html_loadcss(mbuf, args->params.html.css))
-                       return(0);
-               if ( ! ml_puts(mbuf, "    --!></style>\n", &res))
-                       return(0);
-       } else {
-               (void)snprintf(buf, sizeof(buf) - 1, css, 
-                               args->params.html.css);
-               if ( ! ml_puts(mbuf, buf, &res))
-                       return(0);
-       }
+       
+       printf("</%s>", htmltags[tag].name);
+       if (HTML_CLRLINE & htmltags[tag].flags) {
+               h->flags |= HTML_NOSPACE;
+               putchar('\n');
+       } 
+}
+

 
 

-       if ( ! ml_puts(mbuf, trail, &res))
-               return(0);
+void
+print_gen_decls(struct html *h)
+{

 
 

-       return(1);
+       print_xmltype(h);
+       print_doctype(h);

 }
 
 
 }
 
 

-/* ARGSUSED */
-static int 
-html_end(struct md_mbuf *mbuf, const struct md_args *args)
+static void
+print_xmltype(struct html *h)

 {
 
 {
 

-       return(ml_puts(mbuf, "</div></body>\n</html>", NULL));
+       if (HTML_XHTML_1_0_STRICT == h->type)
+               printf("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");

 }
 
 
 }
 
 

-/* 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)
+static void
+print_doctype(struct html *h)

 {
 {

-
-       switch (tok) {
-       case (ROFF_Bl):
-               return(html_Bl_bodytagname(mbuf, q, argc, argv, res));
-       case (ROFF_Fo):
-               return(ml_nputs(mbuf, "span", 4, res));
-       case (ROFF_It):
-               return(html_It_bodytagname(mbuf, q, argc, argv, res));
-       case (ROFF_Oo):
-               return(ml_nputs(mbuf, "span", 4, res));
+       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;

        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(ml_puts(mbuf, "div", res));
+       printf("<!DOCTYPE %s PUBLIC \"%s\" \"%s\">\n", 
+                       name, doctype, dtd);

 }
 
 
 }
 
 

-/* 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)
+void
+print_text(struct html *h, const char *word)

 {
 
 {
 

-       switch (tok) {
-       case (ROFF_It):
-               return(html_It_headtagname(mbuf, q, argc, argv, res));
-       case (ROFF_Fo):
-               return(ml_nputs(mbuf, "span", 4, res));
-       case (ROFF_Oo):
-               return(ml_nputs(mbuf, "span", 4, res));
-       case (ROFF_Sh):
-               return(ml_nputs(mbuf, "h1", 2, res));
-       case (ROFF_Ss):
-               return(ml_nputs(mbuf, "h2", 2, res));
-       default:
-               break;
+       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 ( ! (HTML_NOSPACE & h->flags)) {
+               /* Manage keeps! */
+               if ( ! (HTML_KEEP & h->flags)) {
+                       if (HTML_PREKEEP & h->flags)
+                               h->flags |= HTML_KEEP;
+                       putchar(' ');
+               } else
+                       printf("&#160;");

        }
 
        }
 

-       return(ml_nputs(mbuf, "div", 3, res));
+       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;
+               }

 }
 
 
 }
 
 

-/* 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)
+void
+print_tagq(struct html *h, const struct tag *until)

 {
 {

-
-       switch (tok) {
-       case (ROFF_Fo):
-               return(ml_nputs(mbuf, "span", 4, res));
-       case (ROFF_Oo):
-               return(ml_nputs(mbuf, "span", 4, res));
-       case (ROFF_It):
-               return(html_It_blocktagname(mbuf, q, argc, argv, res));
-       default:
-               break;
+       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(ml_puts(mbuf, "div", res));

 }
 
 
 }
 
 

-/* ARGSUSED */
-static int
-html_printargs(struct md_mbuf *mbuf, int tok, const char *ns,
-               const int *argc, const char **argv, size_t *res)
+void
+print_stagq(struct html *h, const struct tag *suntil)

 {
 {

-
-       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));
+       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);
+       }

 }
 
 
 }
 
 

-/* 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)
+void
+bufinit(struct html *h)

 {
 
 {
 

-       return(html_printargs(mbuf, tok, "head", argc, argv, res));
+       h->buf[0] = '\0';
+       h->buflen = 0;

 }
 
 
 }
 
 

-/* 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
+bufcat_style(struct html *h, const char *key, const char *val)

 {
 
 {
 

-       return(html_printargs(mbuf, tok, "body", argc, argv, res));
+       bufcat(h, key);
+       bufncat(h, ":", 1);
+       bufcat(h, val);
+       bufncat(h, ";", 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)
+void
+bufcat(struct html *h, const char *p)

 {
 
 {
 

-       return(html_printargs(mbuf, tok, "block", argc, argv, res));
+       bufncat(h, p, strlen(p));

 }
 
 
 }
 
 

-/* 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)
+void
+buffmt(struct html *h, const char *fmt, ...)

 {
 {

+       va_list          ap;

 
 

-       if ( ! html_printargs(mbuf, tok, "inline", argc, argv, res))
-               return(0);
-
-       switch (tok) {
-       case (ROFF_Sx):
-               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;
-       }
-       
-       return(1);
+       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 int
-html_inlinetagname(struct md_mbuf *mbuf, 
-               const struct md_args *args, int tok, size_t *res)
+void
+bufncat(struct html *h, const char *p, size_t sz)

 {
 
 {
 

-       switch (tok) {
-       case (ROFF_Pp):
-               return(ml_nputs(mbuf, "div", 3, res));
-       case (ROFF_Sx):
-               return(ml_nputs(mbuf, "a", 1, res));
-       default:
-               break;
-       }
+       if (h->buflen + sz > BUFSIZ - 1)
+               sz = BUFSIZ - 1 - h->buflen;

 
 

-       return(ml_puts(mbuf, "span", res));
+       (void)strncat(h->buf, p, sz);
+       h->buflen += sz;

 }
 
 
 }
 
 

-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)
+void
+buffmt_includes(struct html *h, const char *name)

 {
 {

-       size_t           res;
-       struct htmlq    *q;
-       struct htmlnode *node;
-       int              i;
-
-       assert(ns != MD_NS_DEFAULT);
-       res = 0;
-
-       assert(data);
-       q = (struct htmlq *)data;
+       const char      *p, *pp;

 
 

-       if (NULL == (node = calloc(1, sizeof(struct htmlnode)))) {
-               warn("calloc");
-               return(-1);
+       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);
+}

 
 

-       node->parent = q->last;
-       node->tok = tok;
-       node->ns = ns;

 
 

-       if (argc)  {
-               /* TODO: argv. */
+void
+buffmt_man(struct html *h, 
+               const char *name, const char *sec)
+{
+       const char      *p, *pp;

 
 

-               assert(argv);
-               /* LINTED */
-               for (i = 0; ROFF_ARGMAX != argc[i]
-                               && i < ROFF_MAXLINEARG; i++) 
-                       node->argc[i] = argc[i];
-               assert(i != ROFF_MAXLINEARG);
-       } 
+       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);
+}

 
 
 
 

-       q->last = node;
+void
+bufcat_su(struct html *h, const char *p, const struct roffsu *su)
+{
+       double           v;
+       const char      *u;
+
+       v = su->scale;

 
 

-       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);
+       switch (su->unit) {
+       case (SCALE_CM):
+               u = "cm";

                break;
                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);
+       case (SCALE_IN):
+               u = "in";

                break;
                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);
+       case (SCALE_PC):
+               u = "pc";

                break;
                break;

-       default:
-               if ( ! html_inlinetagname(mbuf, args, tok, &res))
-                       return(-1);
-               if ( ! html_inlinetagargs(mbuf, args, tok, 
-                                       argc, argv, &res))
-                       return(-1);
+       case (SCALE_PT):
+               u = "pt";

                break;
                break;

-       }
-
-       return((ssize_t)res);
-}
-
-
-static ssize_t 
-html_endtag(struct md_mbuf *mbuf, void *data,
-               const struct md_args *args, enum md_ns ns, int tok)
-{
-       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);
+       case (SCALE_EM):
+               u = "em";

                break;
                break;

-       case (MD_NS_BODY):
-               if ( ! html_bodytagname(mbuf, args, tok, 
-                                       q, node->argc, 
-                                       (const char **)node->argv, &res))
-                       return(-1);
+       case (SCALE_MM):
+               if (0 == (v /= 100))
+                       v = 1;
+               u = "em";

                break;
                break;

-       case (MD_NS_HEAD):
-               if ( ! html_headtagname(mbuf, args, tok, 
-                                       q, node->argc,
-                                       (const char **)node->argv, &res))
-                       return(-1);
+       case (SCALE_EN):
+               u = "ex";
+               break;
+       case (SCALE_BU):
+               u = "ex";
+               break;
+       case (SCALE_VS):
+               u = "em";

                break;
        default:
                break;
        default:

-               if ( ! html_inlinetagname(mbuf, args, tok, &res))
-                       return(-1);
+               u = "ex";

                break;
        }
 
                break;
        }
 

-       q->last = node->parent;
-
-       free(node);
-
-       return((ssize_t)res);
-}
-
-
-static int
-html_alloc(void **p)
-{
-
-       if (NULL == (*p = calloc(1, sizeof(struct htmlq)))) {
-               warn("calloc");
-               return(0);
-       }
-       return(1);
-}
-
-
-static void
-html_free(void *p)
-{
-       struct htmlq    *q;
-       struct htmlnode *n;
-
-       assert(p);
-       q = (struct htmlq *)p;
-
-       /* LINTED */
-       while ((n = q->last)) {
-               q->last = n->parent;
-               free(n);
-       }
-
-       free(q);
+       /* 
+        * 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;
+       *dst++ = 'x';
+       *dst = '\0';
+       sz--;

 
 

-       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;
-
-       return(mlg_alloc(args, rbuf, mbuf, &cbs));
+       for ( ; *src != '\0' && sz > 1; src++) {
+               ssz = snprintf(dst, (size_t)sz, "%.2x", *src);
+               sz -= ssz;
+               dst += ssz;
+       }

 }
 }

-