]> git.cameronkatri.com Git - mandoc.git/blobdiff - html.c
git.ckatri.com / mandoc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Enable generation of the desired delim/basic output with groff(1).
[mandoc.git] / html.c
diff --git a/html.c b/html.c
index f7bfa3c2cf67d8f540ed4e9f7962fb117b25cfdc..50fa78ce0cc5b2e30b9cae689dc5f4fe7f964b54 100644 (file)
--- a/html.c
+++ b/html.c
@@ -1,754 +1,988 @@
-/*     $Id: html.c,v 1.104 2010/07/06 11:10:53 kristaps Exp $ */
+/*     $Id: html.c,v 1.261 2019/09/05 13:35:04 schwarze Exp $ */
 /*
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2011-2015, 2017-2019 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
 #include "config.h"
-#endif
 
 #include <sys/types.h>
 
 #include <sys/types.h>
+#include <sys/stat.h>
 
 #include <assert.h>
 #include <ctype.h>
 #include <stdarg.h>
 
 #include <assert.h>
 #include <ctype.h>
 #include <stdarg.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+#include "mandoc_aux.h"
+#include "mandoc_ohash.h"
 #include "mandoc.h"
 #include "mandoc.h"
+#include "roff.h"
 #include "out.h"
 #include "out.h"
-#include "chars.h"
 #include "html.h"
 #include "html.h"
+#include "manconf.h"
 #include "main.h"
 
 struct htmldata {
        const char       *name;
        int               flags;
 #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. */
+#define        HTML_INPHRASE    (1 << 0)  /* Can appear in phrasing context. */
+#define        HTML_TOPHRASE    (1 << 1)  /* Establishes phrasing context. */
+#define        HTML_NOSTACK     (1 << 2)  /* Does not have an end tag. */
+#define        HTML_NLBEFORE    (1 << 3)  /* Output line break before opening. */
+#define        HTML_NLBEGIN     (1 << 4)  /* Output line break after opening. */
+#define        HTML_NLEND       (1 << 5)  /* Output line break before closing. */
+#define        HTML_NLAFTER     (1 << 6)  /* Output line break after closing. */
+#define        HTML_NLAROUND    (HTML_NLBEFORE | HTML_NLAFTER)
+#define        HTML_NLINSIDE    (HTML_NLBEGIN | HTML_NLEND)
+#define        HTML_NLALL       (HTML_NLAROUND | HTML_NLINSIDE)
+#define        HTML_INDENT      (1 << 7)  /* Indent content by two spaces. */
+#define        HTML_NOINDENT    (1 << 8)  /* Exception: never indent content. */
 };
 
 static const struct htmldata htmltags[TAG_MAX] = {
 };
 
 static const struct htmldata htmltags[TAG_MAX] = {
-       {"html",        HTML_CLRLINE}, /* TAG_HTML */
-       {"head",        HTML_CLRLINE}, /* TAG_HEAD */
-       {"body",        HTML_CLRLINE}, /* TAG_BODY */
-       {"meta",        HTML_CLRLINE | HTML_NOSTACK | 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 */
+       {"html",        HTML_NLALL},
+       {"head",        HTML_NLALL | HTML_INDENT},
+       {"meta",        HTML_NOSTACK | HTML_NLALL},
+       {"link",        HTML_NOSTACK | HTML_NLALL},
+       {"style",       HTML_NLALL | HTML_INDENT},
+       {"title",       HTML_NLAROUND},
+       {"body",        HTML_NLALL},
+       {"div",         HTML_NLAROUND},
+       {"section",     HTML_NLALL},
+       {"table",       HTML_NLALL | HTML_INDENT},
+       {"tr",          HTML_NLALL | HTML_INDENT},
+       {"td",          HTML_NLAROUND},
+       {"li",          HTML_NLAROUND | HTML_INDENT},
+       {"ul",          HTML_NLALL | HTML_INDENT},
+       {"ol",          HTML_NLALL | HTML_INDENT},
+       {"dl",          HTML_NLALL | HTML_INDENT},
+       {"dt",          HTML_NLAROUND},
+       {"dd",          HTML_NLAROUND | HTML_INDENT},
+       {"h1",          HTML_TOPHRASE | HTML_NLAROUND},
+       {"h2",          HTML_TOPHRASE | HTML_NLAROUND},
+       {"p",           HTML_TOPHRASE | HTML_NLAROUND | HTML_INDENT},
+       {"pre",         HTML_TOPHRASE | HTML_NLALL | HTML_NOINDENT},
+       {"a",           HTML_INPHRASE | HTML_TOPHRASE},
+       {"b",           HTML_INPHRASE | HTML_TOPHRASE},
+       {"cite",        HTML_INPHRASE | HTML_TOPHRASE},
+       {"code",        HTML_INPHRASE | HTML_TOPHRASE},
+       {"i",           HTML_INPHRASE | HTML_TOPHRASE},
+       {"small",       HTML_INPHRASE | HTML_TOPHRASE},
+       {"span",        HTML_INPHRASE | HTML_TOPHRASE},
+       {"var",         HTML_INPHRASE | HTML_TOPHRASE},
+       {"br",          HTML_INPHRASE | HTML_NOSTACK | HTML_NLALL},
+       {"math",        HTML_INPHRASE | HTML_NLALL | HTML_INDENT},
+       {"mrow",        0},
+       {"mi",          0},
+       {"mn",          0},
+       {"mo",          0},
+       {"msup",        0},
+       {"msub",        0},
+       {"msubsup",     0},
+       {"mfrac",       0},
+       {"msqrt",       0},
+       {"mfenced",     0},
+       {"mtable",      0},
+       {"mtr",         0},
+       {"mtd",         0},
+       {"munderover",  0},
+       {"munder",      0},
+       {"mover",       0},
 };
 
 };
 
-static const char      *const htmlfonts[HTMLFONT_MAX] = {
-       "roman",
-       "bold",
-       "italic"
-};
+/* Avoid duplicate HTML id= attributes. */
+static struct ohash     id_unique;
 
 
-static const char      *const htmlattrs[ATTR_MAX] = {
-       "http-equiv",
-       "content",
-       "name",
-       "rel",
-       "href",
-       "type",
-       "media",
-       "class",
-       "style",
-       "width",
-       "valign",
-       "target",
-       "id",
-       "summary",
-};
+static void     html_reset_internal(struct html *);
+static void     print_byte(struct html *, char);
+static void     print_endword(struct html *);
+static void     print_indent(struct html *);
+static void     print_word(struct html *, const char *);
 
 
-static void              print_spec(struct html *, 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 *);
-static void             *ml_alloc(char *, enum htmltype);
+static void     print_ctag(struct html *, struct tag *);
+static int      print_escape(struct html *, char);
+static int      print_encode(struct html *, const char *, const char *, int);
+static void     print_href(struct html *, const char *, const char *, int);
+static void     print_metaf(struct html *);
 
 
 
 
-static void *
-ml_alloc(char *outopts, enum htmltype type)
+void *
+html_alloc(const struct manoutput *outopts)
 {
        struct html     *h;
 {
        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);
-       }
 
 
-       h->type = type;
-       h->tags.head = NULL;
-       h->ords.head = NULL;
-       h->symtab = chars_init(CHARS_HTML);
+       h = mandoc_calloc(1, sizeof(struct 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;
-               }
+       h->tag = NULL;
+       h->style = outopts->style;
+       if ((h->base_man1 = outopts->man) == NULL)
+               h->base_man2 = NULL;
+       else if ((h->base_man2 = strchr(h->base_man1, ';')) != NULL)
+               *h->base_man2++ = '\0';
+       h->base_includes = outopts->includes;
+       if (outopts->fragment)
+               h->oflags |= HTML_FRAGMENT;
+       if (outopts->toc)
+               h->oflags |= HTML_TOC;
 
 
-       return(h);
+       mandoc_ohash_init(&id_unique, 4, 0);
+
+       return h;
 }
 
 }
 
-void *
-html_alloc(char *outopts)
+static void
+html_reset_internal(struct html *h)
 {
 {
+       struct tag      *tag;
+       char            *cp;
+       unsigned int     slot;
 
 
-       return(ml_alloc(outopts, HTML_HTML_4_01_STRICT));
+       while ((tag = h->tag) != NULL) {
+               h->tag = tag->next;
+               free(tag);
+       }
+       cp = ohash_first(&id_unique, &slot);
+       while (cp != NULL) {
+               free(cp);
+               cp = ohash_next(&id_unique, &slot);
+       }
+       ohash_delete(&id_unique);
 }
 
 }
 
-
-void *
-xhtml_alloc(char *outopts)
+void
+html_reset(void *p)
 {
 {
-
-       return(ml_alloc(outopts, HTML_XHTML_1_0_STRICT));
+       html_reset_internal(p);
+       mandoc_ohash_init(&id_unique, 4, 0);
 }
 
 }
 
-
 void
 html_free(void *p)
 {
 void
 html_free(void *p)
 {
-       struct tag      *tag;
-       struct ord      *ord;
-       struct html     *h;
+       html_reset_internal(p);
+       free(p);
+}
 
 
-       h = (struct html *)p;
+void
+print_gen_head(struct html *h)
+{
+       struct tag      *t;
 
 
-       while ((ord = h->ords.head) != NULL) { 
-               h->ords.head = ord->next;
-               free(ord);
+       print_otag(h, TAG_META, "?", "charset", "utf-8");
+       if (h->style != NULL) {
+               print_otag(h, TAG_LINK, "?h??", "rel", "stylesheet",
+                   h->style, "type", "text/css", "media", "all");
+               return;
        }
 
        }
 
-       while ((tag = h->tags.head) != NULL) {
-               h->tags.head = tag->next;       
-               free(tag);
-       }
-       
-       if (h->symtab)
-               chars_free(h->symtab);
+       /*
+        * Print a minimal embedded style sheet.
+        */
 
 
-       free(h);
+       t = print_otag(h, TAG_STYLE, "");
+       print_text(h, "table.head, table.foot { width: 100%; }");
+       print_endline(h);
+       print_text(h, "td.head-rtitle, td.foot-os { text-align: right; }");
+       print_endline(h);
+       print_text(h, "td.head-vol { text-align: center; }");
+       print_endline(h);
+       print_text(h, ".Nd, .Bf, .Op { display: inline; }");
+       print_endline(h);
+       print_text(h, ".Pa, .Ad { font-style: italic; }");
+       print_endline(h);
+       print_text(h, ".Ms { font-weight: bold; }");
+       print_endline(h);
+       print_text(h, ".Bl-diag ");
+       print_byte(h, '>');
+       print_text(h, " dt { font-weight: bold; }");
+       print_endline(h);
+       print_text(h, "code.Nm, .Fl, .Cm, .Ic, code.In, .Fd, .Fn, .Cd "
+           "{ font-weight: bold; font-family: inherit; }");
+       print_tagq(h, t);
 }
 
 }
 
-
-void
-print_gen_head(struct html *h)
+int
+html_setfont(struct html *h, enum mandoc_esc font)
 {
 {
-       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);
+       switch (font) {
+       case ESCAPE_FONTPREV:
+               font = h->metal;
+               break;
+       case ESCAPE_FONTITALIC:
+       case ESCAPE_FONTBOLD:
+       case ESCAPE_FONTBI:
+       case ESCAPE_FONTCW:
+       case ESCAPE_FONTROMAN:
+               break;
+       case ESCAPE_FONT:
+               font = ESCAPE_FONTROMAN;
+               break;
+       default:
+               return 0;
        }
        }
+       h->metal = h->metac;
+       h->metac = font;
+       return 1;
 }
 
 }
 
-
 static void
 static void
-print_spec(struct html *h, const char *p, size_t len)
+print_metaf(struct html *h)
 {
 {
-       const char      *rhs;
-       size_t           sz;
-
-       rhs = chars_a2ascii(h->symtab, p, len, &sz);
-
-       if (NULL == rhs) 
-               return;
-       fwrite(rhs, 1, sz, stdout);
+       if (h->metaf) {
+               print_tagq(h, h->metaf);
+               h->metaf = NULL;
+       }
+       switch (h->metac) {
+       case ESCAPE_FONTITALIC:
+               h->metaf = print_otag(h, TAG_I, "");
+               break;
+       case ESCAPE_FONTBOLD:
+               h->metaf = print_otag(h, TAG_B, "");
+               break;
+       case ESCAPE_FONTBI:
+               h->metaf = print_otag(h, TAG_B, "");
+               print_otag(h, TAG_I, "");
+               break;
+       case ESCAPE_FONTCW:
+               h->metaf = print_otag(h, TAG_SPAN, "c", "Li");
+               break;
+       default:
+               break;
+       }
 }
 
 }
 
-
-static void
-print_res(struct html *h, const char *p, size_t len)
+void
+html_close_paragraph(struct html *h)
 {
 {
-       const char      *rhs;
-       size_t           sz;
-
-       rhs = chars_a2res(h->symtab, p, len, &sz);
-
-       if (NULL == rhs)
-               return;
-       fwrite(rhs, 1, sz, stdout);
+       struct tag      *this, *next;
+       int              flags;
+
+       this = h->tag;
+       for (;;) {
+               next = this->next;
+               flags = htmltags[this->tag].flags;
+               if (flags & (HTML_INPHRASE | HTML_TOPHRASE))
+                       print_ctag(h, this);
+               if ((flags & HTML_INPHRASE) == 0)
+                       break;
+               this = next;
+       }
 }
 
 }
 
-
-struct tag *
-print_ofont(struct html *h, enum htmlfont font)
+/*
+ * ROFF_nf switches to no-fill mode, ROFF_fi to fill mode.
+ * TOKEN_NONE does not switch.  The old mode is returned.
+ */
+enum roff_tok
+html_fillmode(struct html *h, enum roff_tok want)
 {
 {
-       struct htmlpair  tag;
+       struct tag      *t;
+       enum roff_tok    had;
 
 
-       h->metal = h->metac;
-       h->metac = font;
+       for (t = h->tag; t != NULL; t = t->next)
+               if (t->tag == TAG_PRE)
+                       break;
 
 
-       /* FIXME: DECO_ROMAN should just close out preexisting. */
+       had = t == NULL ? ROFF_fi : ROFF_nf;
 
 
-       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);
+       if (want != had) {
+               switch (want) {
+               case ROFF_fi:
+                       print_tagq(h, t);
+                       break;
+               case ROFF_nf:
+                       html_close_paragraph(h);
+                       print_otag(h, TAG_PRE, "");
+                       break;
+               case TOKEN_NONE:
+                       break;
+               default:
+                       abort();
+               }
+       }
+       return had;
 }
 
 }
 
+char *
+html_make_id(const struct roff_node *n, int unique)
+{
+       const struct roff_node  *nch;
+       char                    *buf, *bufs, *cp;
+       unsigned int             slot;
+       int                      suffix;
+
+       for (nch = n->child; nch != NULL; nch = nch->next)
+               if (nch->type != ROFFT_TEXT)
+                       return NULL;
+
+       buf = NULL;
+       deroff(&buf, n);
+       if (buf == NULL)
+               return NULL;
+
+       /*
+        * In ID attributes, only use ASCII characters that are
+        * permitted in URL-fragment strings according to the
+        * explicit list at:
+        * https://url.spec.whatwg.org/#url-fragment-string
+        */
+
+       for (cp = buf; *cp != '\0'; cp++)
+               if (isalnum((unsigned char)*cp) == 0 &&
+                   strchr("!$&'()*+,-./:;=?@_~", *cp) == NULL)
+                       *cp = '_';
+
+       if (unique == 0)
+               return buf;
+
+       /* Avoid duplicate HTML id= attributes. */
+
+       bufs = NULL;
+       suffix = 1;
+       slot = ohash_qlookup(&id_unique, buf);
+       cp = ohash_find(&id_unique, slot);
+       if (cp != NULL) {
+               while (cp != NULL) {
+                       free(bufs);
+                       if (++suffix > 127) {
+                               free(buf);
+                               return NULL;
+                       }
+                       mandoc_asprintf(&bufs, "%s_%d", buf, suffix);
+                       slot = ohash_qlookup(&id_unique, bufs);
+                       cp = ohash_find(&id_unique, slot);
+               }
+               free(buf);
+               buf = bufs;
+       }
+       ohash_insert(&id_unique, slot, buf);
+       return buf;
+}
 
 
-static void
-print_metaf(struct html *h, enum roffdeco deco)
+static int
+print_escape(struct html *h, char c)
 {
 {
-       enum htmlfont    font;
 
 
-       switch (deco) {
-       case (DECO_PREVIOUS):
-               font = h->metal;
+       switch (c) {
+       case '<':
+               print_word(h, "&lt;");
+               break;
+       case '>':
+               print_word(h, "&gt;");
+               break;
+       case '&':
+               print_word(h, "&amp;");
+               break;
+       case '"':
+               print_word(h, "&quot;");
                break;
                break;
-       case (DECO_ITALIC):
-               font = HTMLFONT_ITALIC;
+       case ASCII_NBRSP:
+               print_word(h, "&nbsp;");
                break;
                break;
-       case (DECO_BOLD):
-               font = HTMLFONT_BOLD;
+       case ASCII_HYPH:
+               print_byte(h, '-');
                break;
                break;
-       case (DECO_ROMAN):
-               font = HTMLFONT_NONE;
+       case ASCII_BREAK:
                break;
        default:
                break;
        default:
-               abort();
-               /* NOTREACHED */
+               return 0;
        }
        }
-
-       (void)print_ofont(h, font);
+       return 1;
 }
 
 }
 
-
 static int
 static int
-print_encode(struct html *h, const char *p, int norecurse)
+print_encode(struct html *h, const char *p, const char *pend, int norecurse)
 {
 {
-       size_t           sz;
-       int              len, nospace;
+       char             numbuf[16];
        const char      *seq;
        const char      *seq;
-       enum roffdeco    deco;
-       static const char rejs[6] = { '\\', '<', '>', '&', ASCII_HYPH, '\0' };
+       size_t           sz;
+       int              c, len, breakline, nospace;
+       enum mandoc_esc  esc;
+       static const char rejs[10] = { ' ', '\\', '<', '>', '&', '"',
+               ASCII_NBRSP, ASCII_HYPH, ASCII_BREAK, '\0' };
+
+       if (pend == NULL)
+               pend = strchr(p, '\0');
 
 
+       breakline = 0;
        nospace = 0;
 
        nospace = 0;
 
-       for (; *p; p++) {
-               sz = strcspn(p, rejs);
+       while (p < pend) {
+               if (HTML_SKIPCHAR & h->flags && '\\' != *p) {
+                       h->flags &= ~HTML_SKIPCHAR;
+                       p++;
+                       continue;
+               }
 
 
-               fwrite(p, 1, sz, stdout);
-               p += /* LINTED */
-                       sz;
+               for (sz = strcspn(p, rejs); sz-- && p < pend; p++)
+                       print_byte(h, *p);
 
 
-               if ('<' == *p) {
-                       printf("&lt;");
+               if (breakline &&
+                   (p >= pend || *p == ' ' || *p == ASCII_NBRSP)) {
+                       print_otag(h, TAG_BR, "");
+                       breakline = 0;
+                       while (p < pend && (*p == ' ' || *p == ASCII_NBRSP))
+                               p++;
                        continue;
                        continue;
-               } else if ('>' == *p) {
-                       printf("&gt;");
+               }
+
+               if (p >= pend)
+                       break;
+
+               if (*p == ' ') {
+                       print_endword(h);
+                       p++;
                        continue;
                        continue;
-               } else if ('&' == *p) {
-                       printf("&amp;");
+               }
+
+               if (print_escape(h, *p++))
                        continue;
                        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('-');
+
+               esc = mandoc_escape(&p, &seq, &len);
+               switch (esc) {
+               case ESCAPE_FONT:
+               case ESCAPE_FONTPREV:
+               case ESCAPE_FONTBOLD:
+               case ESCAPE_FONTITALIC:
+               case ESCAPE_FONTBI:
+               case ESCAPE_FONTCW:
+               case ESCAPE_FONTROMAN:
+                       if (0 == norecurse) {
+                               h->flags |= HTML_NOSPACE;
+                               if (html_setfont(h, esc))
+                                       print_metaf(h);
+                               h->flags &= ~HTML_NOSPACE;
+                       }
                        continue;
                        continue;
-               } else if ('\0' == *p)
+               case ESCAPE_SKIPCHAR:
+                       h->flags |= HTML_SKIPCHAR;
+                       continue;
+               case ESCAPE_ERROR:
+                       continue;
+               default:
                        break;
                        break;
+               }
 
 
-               seq = ++p;
-               len = a2roffdeco(&deco, &seq, &sz);
+               if (h->flags & HTML_SKIPCHAR) {
+                       h->flags &= ~HTML_SKIPCHAR;
+                       continue;
+               }
 
 
-               switch (deco) {
-               case (DECO_RESERVED):
-                       print_res(h, seq, sz);
+               switch (esc) {
+               case ESCAPE_UNICODE:
+                       /* Skip past "u" header. */
+                       c = mchars_num2uc(seq + 1, len - 1);
                        break;
                        break;
-               case (DECO_SPECIAL):
-                       print_spec(h, seq, sz);
+               case ESCAPE_NUMBERED:
+                       c = mchars_num2char(seq, len);
+                       if (c < 0)
+                               continue;
                        break;
                        break;
-               case (DECO_PREVIOUS):
-                       /* FALLTHROUGH */
-               case (DECO_BOLD):
-                       /* FALLTHROUGH */
-               case (DECO_ITALIC):
-                       /* FALLTHROUGH */
-               case (DECO_ROMAN):
-                       if (norecurse)
-                               break;
-                       print_metaf(h, deco);
+               case ESCAPE_SPECIAL:
+                       c = mchars_spec2cp(seq, len);
+                       if (c <= 0)
+                               continue;
                        break;
                        break;
-               default:
+               case ESCAPE_UNDEF:
+                       c = *seq;
+                       break;
+               case ESCAPE_DEVICE:
+                       print_word(h, "html");
+                       continue;
+               case ESCAPE_BREAK:
+                       breakline = 1;
+                       continue;
+               case ESCAPE_NOSPACE:
+                       if ('\0' == *p)
+                               nospace = 1;
+                       continue;
+               case ESCAPE_OVERSTRIKE:
+                       if (len == 0)
+                               continue;
+                       c = seq[len - 1];
                        break;
                        break;
+               default:
+                       continue;
                }
                }
-
-               p += len - 1;
-
-               if (DECO_NOSPACE == deco && '\0' == *(p + 1))
-                       nospace = 1;
+               if ((c < 0x20 && c != 0x09) ||
+                   (c > 0x7E && c < 0xA0))
+                       c = 0xFFFD;
+               if (c > 0x7E) {
+                       (void)snprintf(numbuf, sizeof(numbuf), "&#x%.4X;", c);
+                       print_word(h, numbuf);
+               } else if (print_escape(h, c) == 0)
+                       print_byte(h, c);
        }
 
        }
 
-       return(nospace);
+       return nospace;
 }
 
 }
 
-
 static void
 static void
-print_attr(struct html *h, const char *key, const char *val)
+print_href(struct html *h, const char *name, const char *sec, int man)
 {
 {
-       printf(" %s=\"", key);
-       (void)print_encode(h, val, 1);
-       putchar('\"');
+       struct stat      sb;
+       const char      *p, *pp;
+       char            *filename;
+
+       if (man) {
+               pp = h->base_man1;
+               if (h->base_man2 != NULL) {
+                       mandoc_asprintf(&filename, "%s.%s", name, sec);
+                       if (stat(filename, &sb) == -1)
+                               pp = h->base_man2;
+                       free(filename);
+               }
+       } else
+               pp = h->base_includes;
+
+       while ((p = strchr(pp, '%')) != NULL) {
+               print_encode(h, pp, p, 1);
+               if (man && p[1] == 'S') {
+                       if (sec == NULL)
+                               print_byte(h, '1');
+                       else
+                               print_encode(h, sec, NULL, 1);
+               } else if ((man && p[1] == 'N') ||
+                   (man == 0 && p[1] == 'I'))
+                       print_encode(h, name, NULL, 1);
+               else
+                       print_encode(h, p, p + 2, 1);
+               pp = p + 2;
+       }
+       if (*pp != '\0')
+               print_encode(h, pp, NULL, 1);
 }
 
 }
 
-
 struct tag *
 struct tag *
-print_otag(struct html *h, enum htmltag tag, 
-               int sz, const struct htmlpair *p)
+print_otag(struct html *h, enum htmltag tag, const char *fmt, ...)
 {
 {
-       int              i;
+       va_list          ap;
        struct tag      *t;
        struct tag      *t;
+       const char      *attr;
+       char            *arg1, *arg2;
+       int              style_written, tflags;
 
 
-       /* 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;
+       tflags = htmltags[tag].flags;
 
 
-       if ( ! (HTML_NOSPACE & h->flags))
-               if ( ! (HTML_CLRLINE & htmltags[tag].flags))
-                       putchar(' ');
+       /* Flow content is not allowed in phrasing context. */
 
 
-       /* 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);
-
-       /* 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");
-       }
-
-       /* 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:
+       if ((tflags & HTML_INPHRASE) == 0) {
+               for (t = h->tag; t != NULL; t = t->next) {
+                       if (t->closed)
+                               continue;
+                       assert((htmltags[t->tag].flags & HTML_TOPHRASE) == 0);
                        break;
                }
 
                        break;
                }
 
-       putchar('>');
-
-       h->flags |= HTML_NOSPACE;
-       return(t);
-}
-
-
-static void
-print_ctag(struct html *h, enum htmltag tag)
-{
-       
-       printf("</%s>", htmltags[tag].name);
-       if (HTML_CLRLINE & htmltags[tag].flags) {
-               h->flags |= HTML_NOSPACE;
-               putchar('\n');
-       } 
-}
-
+       /*
+        * Always wrap phrasing elements in a paragraph
+        * unless already contained in some flow container;
+        * never put them directly into a section.
+        */
 
 
-void
-print_gen_decls(struct html *h)
-{
+       } else if (tflags & HTML_TOPHRASE && h->tag->tag == TAG_SECTION)
+               print_otag(h, TAG_P, "c", "Pp");
 
 
-       print_xmltype(h);
-       print_doctype(h);
-}
+       /* Push this tag onto the stack of open scopes. */
 
 
+       if ((tflags & HTML_NOSTACK) == 0) {
+               t = mandoc_malloc(sizeof(struct tag));
+               t->tag = tag;
+               t->next = h->tag;
+               t->refcnt = 0;
+               t->closed = 0;
+               h->tag = t;
+       } else
+               t = NULL;
 
 
-static void
-print_xmltype(struct html *h)
-{
+       if (tflags & HTML_NLBEFORE)
+               print_endline(h);
+       if (h->col == 0)
+               print_indent(h);
+       else if ((h->flags & HTML_NOSPACE) == 0) {
+               if (h->flags & HTML_KEEP)
+                       print_word(h, "&#x00A0;");
+               else {
+                       if (h->flags & HTML_PREKEEP)
+                               h->flags |= HTML_KEEP;
+                       print_endword(h);
+               }
+       }
 
 
-       if (HTML_XHTML_1_0_STRICT == h->type)
-               printf("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-}
+       if ( ! (h->flags & HTML_NONOSPACE))
+               h->flags &= ~HTML_NOSPACE;
+       else
+               h->flags |= HTML_NOSPACE;
 
 
+       /* Print out the tag name and attributes. */
 
 
-static void
-print_doctype(struct html *h)
-{
-       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:
-               name = "html";
-               doctype = "-//W3C//DTD XHTML 1.0 Strict//EN";
-               dtd = "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";
-               break;
-       }
+       print_byte(h, '<');
+       print_word(h, htmltags[tag].name);
 
 
-       printf("<!DOCTYPE %s PUBLIC \"%s\" \"%s\">\n", 
-                       name, doctype, dtd);
-}
+       va_start(ap, fmt);
 
 
+       while (*fmt != '\0' && *fmt != 's') {
 
 
-void
-print_text(struct html *h, const char *word)
-{
+               /* Parse attributes and arguments. */
 
 
-       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;
+               arg1 = va_arg(ap, char *);
+               arg2 = NULL;
+               switch (*fmt++) {
+               case 'c':
+                       attr = "class";
                        break;
                        break;
-               default:
+               case 'h':
+                       attr = "href";
+                       break;
+               case 'i':
+                       attr = "id";
+                       break;
+               case '?':
+                       attr = arg1;
+                       arg1 = va_arg(ap, char *);
                        break;
                        break;
+               default:
+                       abort();
                }
                }
+               if (*fmt == 'M')
+                       arg2 = va_arg(ap, char *);
+               if (arg1 == NULL)
+                       continue;
 
 
-       if ( ! (h->flags & HTML_NOSPACE))
-               putchar(' ');
-
-       assert(word);
-       if ( ! print_encode(h, word, 0))
-               h->flags &= ~HTML_NOSPACE;
+               /* Print the attributes. */
 
 
-       /* 
-        * 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;
+               print_byte(h, ' ');
+               print_word(h, attr);
+               print_byte(h, '=');
+               print_byte(h, '"');
+               switch (*fmt) {
+               case 'I':
+                       print_href(h, arg1, NULL, 0);
+                       fmt++;
+                       break;
+               case 'M':
+                       print_href(h, arg1, arg2, 1);
+                       fmt++;
+                       break;
+               case 'R':
+                       print_byte(h, '#');
+                       print_encode(h, arg1, NULL, 1);
+                       fmt++;
                        break;
                default:
                        break;
                default:
+                       print_encode(h, arg1, NULL, 1);
                        break;
                }
                        break;
                }
-}
+               print_byte(h, '"');
+       }
 
 
+       style_written = 0;
+       while (*fmt++ == 's') {
+               arg1 = va_arg(ap, char *);
+               arg2 = va_arg(ap, char *);
+               if (arg2 == NULL)
+                       continue;
+               print_byte(h, ' ');
+               if (style_written == 0) {
+                       print_word(h, "style=\"");
+                       style_written = 1;
+               }
+               print_word(h, arg1);
+               print_byte(h, ':');
+               print_byte(h, ' ');
+               print_word(h, arg2);
+               print_byte(h, ';');
+       }
+       if (style_written)
+               print_byte(h, '"');
 
 
-void
-print_tagq(struct html *h, const struct tag *until)
-{
-       struct tag      *tag;
+       va_end(ap);
 
 
-       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;
-       }
-}
+       /* Accommodate for "well-formed" singleton escaping. */
 
 
+       if (htmltags[tag].flags & HTML_NOSTACK)
+               print_byte(h, '/');
 
 
-void
-print_stagq(struct html *h, const struct tag *suntil)
+       print_byte(h, '>');
+
+       if (tflags & HTML_NLBEGIN)
+               print_endline(h);
+       else
+               h->flags |= HTML_NOSPACE;
+
+       if (tflags & HTML_INDENT)
+               h->indent++;
+       if (tflags & HTML_NOINDENT)
+               h->noindent++;
+
+       return t;
+}
+
+static void
+print_ctag(struct html *h, struct tag *tag)
 {
 {
-       struct tag      *tag;
+       int      tflags;
 
 
-       while ((tag = h->tags.head) != NULL) {
-               if (suntil && tag == suntil)
-                       return;
+       if (tag->closed == 0) {
+               tag->closed = 1;
                if (tag == h->metaf)
                        h->metaf = NULL;
                if (tag == h->metaf)
                        h->metaf = NULL;
-               print_ctag(h, tag->tag);
-               h->tags.head = tag->next;
+               if (tag == h->tblt)
+                       h->tblt = NULL;
+
+               tflags = htmltags[tag->tag].flags;
+               if (tflags & HTML_INDENT)
+                       h->indent--;
+               if (tflags & HTML_NOINDENT)
+                       h->noindent--;
+               if (tflags & HTML_NLEND)
+                       print_endline(h);
+               print_indent(h);
+               print_byte(h, '<');
+               print_byte(h, '/');
+               print_word(h, htmltags[tag->tag].name);
+               print_byte(h, '>');
+               if (tflags & HTML_NLAFTER)
+                       print_endline(h);
+       }
+       if (tag->refcnt == 0) {
+               h->tag = tag->next;
                free(tag);
        }
 }
 
                free(tag);
        }
 }
 
-
 void
 void
-bufinit(struct html *h)
+print_gen_decls(struct html *h)
 {
 {
-
-       h->buf[0] = '\0';
-       h->buflen = 0;
+       print_word(h, "<!DOCTYPE html>");
+       print_endline(h);
 }
 
 }
 
-
 void
 void
-bufcat_style(struct html *h, const char *key, const char *val)
+print_gen_comment(struct html *h, struct roff_node *n)
 {
 {
-
-       bufcat(h, key);
-       bufncat(h, ":", 1);
-       bufcat(h, val);
-       bufncat(h, ";", 1);
+       int      wantblank;
+
+       print_word(h, "<!-- This is an automatically generated file."
+           "  Do not edit.");
+       h->indent = 1;
+       wantblank = 0;
+       while (n != NULL && n->type == ROFFT_COMMENT) {
+               if (strstr(n->string, "-->") == NULL &&
+                   (wantblank || *n->string != '\0')) {
+                       print_endline(h);
+                       print_indent(h);
+                       print_word(h, n->string);
+                       wantblank = *n->string != '\0';
+               }
+               n = n->next;
+       }
+       if (wantblank)
+               print_endline(h);
+       print_word(h, " -->");
+       print_endline(h);
+       h->indent = 0;
 }
 
 }
 
-
 void
 void
-bufcat(struct html *h, const char *p)
+print_text(struct html *h, const char *word)
 {
 {
+       /*
+        * Always wrap text in a paragraph unless already contained in
+        * some flow container; never put it directly into a section.
+        */
 
 
-       bufncat(h, p, strlen(p));
-}
-
+       if (h->tag->tag == TAG_SECTION)
+               print_otag(h, TAG_P, "c", "Pp");
 
 
-void
-buffmt(struct html *h, const char *fmt, ...)
-{
-       va_list          ap;
+       /* Output whitespace before this text? */
 
 
-       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);
-}
+       if (h->col && (h->flags & HTML_NOSPACE) == 0) {
+               if ( ! (HTML_KEEP & h->flags)) {
+                       if (HTML_PREKEEP & h->flags)
+                               h->flags |= HTML_KEEP;
+                       print_endword(h);
+               } else
+                       print_word(h, "&#x00A0;");
+       }
 
 
+       /*
+        * Print the text, optionally surrounded by HTML whitespace,
+        * optionally manually switching fonts before and after.
+        */
 
 
-void
-bufncat(struct html *h, const char *p, size_t sz)
-{
+       assert(h->metaf == NULL);
+       print_metaf(h);
+       print_indent(h);
+       if ( ! print_encode(h, word, NULL, 0)) {
+               if ( ! (h->flags & HTML_NONOSPACE))
+                       h->flags &= ~HTML_NOSPACE;
+               h->flags &= ~HTML_NONEWLINE;
+       } else
+               h->flags |= HTML_NOSPACE | HTML_NONEWLINE;
 
 
-       if (h->buflen + sz > BUFSIZ - 1)
-               sz = BUFSIZ - 1 - h->buflen;
+       if (h->metaf != NULL) {
+               print_tagq(h, h->metaf);
+               h->metaf = NULL;
+       }
 
 
-       (void)strncat(h->buf, p, sz);
-       h->buflen += sz;
+       h->flags &= ~HTML_IGNDELIM;
 }
 
 }
 
-
 void
 void
-buffmt_includes(struct html *h, const char *name)
+print_tagq(struct html *h, const struct tag *until)
 {
 {
-       const char      *p, *pp;
+       struct tag      *this, *next;
 
 
-       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;
+       for (this = h->tag; this != NULL; this = next) {
+               next = this == until ? NULL : this->next;
+               print_ctag(h, this);
        }
        }
-       if (pp)
-               bufcat(h, pp);
 }
 
 }
 
-
+/*
+ * Close out all open elements up to but excluding suntil.
+ * Note that a paragraph just inside stays open together with it
+ * because paragraphs include subsequent phrasing content.
+ */
 void
 void
-buffmt_man(struct html *h, 
-               const char *name, const char *sec)
+print_stagq(struct html *h, const struct tag *suntil)
 {
 {
-       const char      *p, *pp;
+       struct tag      *this, *next;
 
 
-       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);
+       for (this = h->tag; this != NULL; this = next) {
+               next = this->next;
+               if (this == suntil || (next == suntil &&
+                   (this->tag == TAG_P || this->tag == TAG_PRE)))
                        break;
                        break;
-               }
-               pp = p + 2;
+               print_ctag(h, this);
        }
        }
-       if (pp)
-               bufcat(h, pp);
 }
 
 
 }
 
 
-void
-bufcat_su(struct html *h, const char *p, const struct roffsu *su)
-{
-       double           v;
-       const char      *u;
+/***********************************************************************
+ * Low level output functions.
+ * They implement line breaking using a short static buffer.
+ ***********************************************************************/
 
 
-       v = su->scale;
+/*
+ * Buffer one HTML output byte.
+ * If the buffer is full, flush and deactivate it and start a new line.
+ * If the buffer is inactive, print directly.
+ */
+static void
+print_byte(struct html *h, char c)
+{
+       if ((h->flags & HTML_BUFFER) == 0) {
+               putchar(c);
+               h->col++;
+               return;
+       }
 
 
-       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;
+       if (h->col + h->bufcol < sizeof(h->buf)) {
+               h->buf[h->bufcol++] = c;
+               return;
        }
 
        }
 
-       /* 
-        * 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);
+       putchar('\n');
+       h->col = 0;
+       print_indent(h);
+       putchar(' ');
+       putchar(' ');
+       fwrite(h->buf, h->bufcol, 1, stdout);
+       putchar(c);
+       h->col = (h->indent + 1) * 2 + h->bufcol + 1;
+       h->bufcol = 0;
+       h->flags &= ~HTML_BUFFER;
 }
 
 }
 
-
+/*
+ * If something was printed on the current output line, end it.
+ * Not to be called right after print_indent().
+ */
 void
 void
-html_idcat(char *dst, const char *src, int sz)
+print_endline(struct html *h)
 {
 {
-       int              ssz;
+       if (h->col == 0)
+               return;
 
 
-       assert(sz);
+       if (h->bufcol) {
+               putchar(' ');
+               fwrite(h->buf, h->bufcol, 1, stdout);
+               h->bufcol = 0;
+       }
+       putchar('\n');
+       h->col = 0;
+       h->flags |= HTML_NOSPACE;
+       h->flags &= ~HTML_BUFFER;
+}
 
 
-       /* Cf. <http://www.w3.org/TR/html4/types.html#h-6.2>. */
+/*
+ * Flush the HTML output buffer.
+ * If it is inactive, activate it.
+ */
+static void
+print_endword(struct html *h)
+{
+       if (h->noindent) {
+               print_byte(h, ' ');
+               return;
+       }
 
 
-       for ( ; *dst != '\0' && sz; dst++, sz--)
-               /* Jump to end. */ ;
+       if ((h->flags & HTML_BUFFER) == 0) {
+               h->col++;
+               h->flags |= HTML_BUFFER;
+       } else if (h->bufcol) {
+               putchar(' ');
+               fwrite(h->buf, h->bufcol, 1, stdout);
+               h->col += h->bufcol + 1;
+       }
+       h->bufcol = 0;
+}
 
 
-       assert(sz > 2);
+/*
+ * If at the beginning of a new output line,
+ * perform indentation and mark the line as containing output.
+ * Make sure to really produce some output right afterwards,
+ * but do not use print_otag() for producing it.
+ */
+static void
+print_indent(struct html *h)
+{
+       size_t   i;
 
 
-       /* We can't start with a number (bah). */
+       if (h->col || h->noindent)
+               return;
 
 
-       *dst++ = 'x';
-       *dst = '\0';
-       sz--;
+       h->col = h->indent * 2;
+       for (i = 0; i < h->col; i++)
+               putchar(' ');
+}
 
 
-       for ( ; *src != '\0' && sz > 1; src++) {
-               ssz = snprintf(dst, (size_t)sz, "%.2x", *src);
-               sz -= ssz;
-               dst += ssz;
-       }
+/*
+ * Print or buffer some characters
+ * depending on the current HTML output buffer state.
+ */
+static void
+print_word(struct html *h, const char *cp)
+{
+       while (*cp != '\0')
+               print_byte(h, *cp++);
 }
 }
A git conversion mirror of mandoc.bsd.lv