Use the correct Unicode value for the zero-width space, which means that

[mandoc.git] / html.c

diff --git a/html.c b/html.c
index ae7c50b8d2a8677dcaf4abef0159acc58cd3fed5..45471fe3b050c7456a57abd8ea68aee51d4c3008 100644 (file)
--- a/html.c
+++ b/html.c
@@ -1,6 +1,7 @@
-/*     $Id: html.c,v 1.53 2009/10/03 15:08:09 kristaps Exp $ */
+/*     $Id: html.c,v 1.147 2011/05/24 21:40:14 kristaps Exp $ */

 /*
 /*

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


@@ -14,102 +15,134 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * 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"
+#endif
+

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

-#include <sys/queue.h>

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

-#include <err.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 <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 

-#include "chars.h"
+#include "mandoc.h"
+#include "libmandoc.h"
+#include "out.h"

 #include "html.h"
 #include "html.h"

-
-#define        DOCTYPE         "-//W3C//DTD HTML 4.01//EN"
-#define        DTD             "http://www.w3.org/TR/html4/strict.dtd"
+#include "main.h"

 
 struct htmldata {
 
 struct htmldata {

-       char             *name;
+       const char       *name;

        int               flags;
 #define        HTML_CLRLINE     (1 << 0)
 #define        HTML_NOSTACK     (1 << 1)
        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 */
 };
 
 static const struct htmldata htmltags[TAG_MAX] = {
        {"html",        HTML_CLRLINE}, /* TAG_HTML */
        {"head",        HTML_CLRLINE}, /* TAG_HEAD */
        {"body",        HTML_CLRLINE}, /* TAG_BODY */

-       {"meta",        HTML_CLRLINE | HTML_NOSTACK}, /* TAG_META */
+       {"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 */
        {"title",       HTML_CLRLINE}, /* TAG_TITLE */
        {"div",         HTML_CLRLINE}, /* TAG_DIV */
        {"h1",          0}, /* TAG_H1 */
        {"h2",          0}, /* TAG_H2 */

-       {"p",           HTML_CLRLINE}, /* TAG_P */

        {"span",        0}, /* TAG_SPAN */
        {"span",        0}, /* TAG_SPAN */

-       {"link",        HTML_CLRLINE | HTML_NOSTACK}, /* TAG_LINK */
-       {"br",          HTML_CLRLINE | HTML_NOSTACK}, /* TAG_LINK */
+       {"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 */
        {"a",           0}, /* TAG_A */
        {"table",       HTML_CLRLINE}, /* TAG_TABLE */

-       {"col",         HTML_CLRLINE | HTML_NOSTACK}, /* TAG_COL */
+       {"tbody",       HTML_CLRLINE}, /* TAG_TBODY */
+       {"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 */
        {"tr",          HTML_CLRLINE}, /* TAG_TR */
        {"td",          HTML_CLRLINE}, /* TAG_TD */
        {"li",          HTML_CLRLINE}, /* TAG_LI */
        {"ul",          HTML_CLRLINE}, /* TAG_UL */
        {"ol",          HTML_CLRLINE}, /* TAG_OL */

-       {"base",        HTML_CLRLINE | HTML_NOSTACK}, /* TAG_BASE */
+       {"dl",          HTML_CLRLINE}, /* TAG_DL */
+       {"dt",          HTML_CLRLINE}, /* TAG_DT */
+       {"dd",          HTML_CLRLINE}, /* TAG_DD */
+       {"blockquote",  HTML_CLRLINE}, /* TAG_BLOCKQUOTE */
+       {"p",           HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* TAG_P */
+       {"pre",         HTML_CLRLINE }, /* TAG_PRE */
+       {"b",           0 }, /* TAG_B */
+       {"i",           0 }, /* TAG_I */
+       {"code",        0 }, /* TAG_CODE */
+       {"small",       0 }, /* TAG_SMALL */

 };
 
 };
 

-static const char       *const htmlattrs[ATTR_MAX] = {
-       "http-equiv",
-       "content",
-       "name",
-       "rel",
-       "href",
-       "type",
-       "media",
-       "class",
-       "style",
-       "width",
-       "valign",
+static const char      *const htmlattrs[ATTR_MAX] = {
+       "http-equiv", /* ATTR_HTTPEQUIV */
+       "content", /* ATTR_CONTENT */
+       "name", /* ATTR_NAME */
+       "rel", /* ATTR_REL */
+       "href", /* ATTR_HREF */
+       "type", /* ATTR_TYPE */
+       "media", /* ATTR_MEDIA */
+       "class", /* ATTR_CLASS */
+       "style", /* ATTR_STYLE */
+       "width", /* ATTR_WIDTH */
+       "id", /* ATTR_ID */
+       "summary", /* ATTR_SUMMARY */
+       "align", /* ATTR_ALIGN */
+       "colspan", /* ATTR_COLSPAN */

 };
 
 };
 

-#ifdef __linux__
-extern int               getsubopt(char **, char * const *, char **);
-#endif
+static const char      *const roffscales[SCALE_MAX] = {
+       "cm", /* SCALE_CM */
+       "in", /* SCALE_IN */
+       "pc", /* SCALE_PC */
+       "pt", /* SCALE_PT */
+       "em", /* SCALE_EM */
+       "em", /* SCALE_MM */
+       "ex", /* SCALE_EN */
+       "ex", /* SCALE_BU */
+       "em", /* SCALE_VS */
+       "ex", /* SCALE_FS */
+};

 
 

-void *
-html_alloc(char *outopts)
+static void     bufncat(struct html *, const char *, size_t);
+static void     print_ctag(struct html *, enum htmltag);
+static int      print_encode(struct html *, const char *, int);
+static void     print_metaf(struct html *, enum mandoc_esc);
+static void     print_attr(struct html *, const char *, const char *);
+static void     *ml_alloc(char *, enum htmltype);
+
+static void *
+ml_alloc(char *outopts, enum htmltype type)

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

-       char            *toks[4], *v;
+       const char      *toks[4];
+       char            *v;

 
        toks[0] = "style";
        toks[1] = "man";
 
        toks[0] = "style";
        toks[1] = "man";

-       toks[2] = NULL;
-
-       if (NULL == (h = calloc(1, sizeof(struct html))))
-               return(NULL);
-
-       SLIST_INIT(&h->tags);
-       SLIST_INIT(&h->ords);
+       toks[2] = "includes";
+       toks[3] = NULL;

 
 

-       if (NULL == (h->symtab = chars_init(CHARS_HTML))) {
-               free(h);
-               return(NULL);
-       }
+       h = mandoc_calloc(1, sizeof(struct html));

 
 

-       h->base_man = "%N.%S.html";
+       h->type = type;
+       h->tags.head = NULL;
+       h->symtab = mchars_alloc();

 
        while (outopts && *outopts)
 
        while (outopts && *outopts)

-               switch (getsubopt(&outopts, toks, &v)) {
+               switch (getsubopt(&outopts, UNCONST(toks), &v)) {

                case (0):
                        h->style = v;
                        break;
                case (1):
                        h->base_man = v;
                        break;
                case (0):
                        h->style = v;
                        break;
                case (1):
                        h->base_man = v;
                        break;

+               case (2):
+                       h->base_includes = v;
+                       break;

                default:
                        break;
                }
                default:
                        break;
                }


@@ -117,32 +150,37 @@ html_alloc(char *outopts)
        return(h);
 }
 
        return(h);
 }
 

+void *
+html_alloc(char *outopts)
+{
+
+       return(ml_alloc(outopts, HTML_HTML_4_01_STRICT));
+}
+
+
+void *
+xhtml_alloc(char *outopts)
+{
+
+       return(ml_alloc(outopts, HTML_XHTML_1_0_STRICT));
+}
+

 
 void
 html_free(void *p)
 {
        struct tag      *tag;
 
 void
 html_free(void *p)
 {
        struct tag      *tag;

-       struct ord      *ord;

        struct html     *h;
 
        h = (struct html *)p;
 
        struct html     *h;
 
        h = (struct html *)p;
 

-       while ( ! SLIST_EMPTY(&h->ords)) {
-               ord = SLIST_FIRST(&h->ords);
-               SLIST_REMOVE_HEAD(&h->ords, entry);
-               free(ord);
-       }
-
-       while ( ! SLIST_EMPTY(&h->tags)) {
-               tag = SLIST_FIRST(&h->tags);
-               SLIST_REMOVE_HEAD(&h->tags, entry);
+       while ((tag = h->tags.head) != NULL) {
+               h->tags.head = tag->next;       

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

-       if (h->buf)
-               free(h->buf);

        if (h->symtab)
        if (h->symtab)

-               chars_free(h->symtab);
+               mchars_free(h->symtab);

 
        free(h);
 }
 
        free(h);
 }


@@ -178,163 +216,174 @@ print_gen_head(struct html *h)
        }
 }
 
        }
 }
 

-

 static void
 static void

-print_spec(struct html *h, const char *p, int len)
+print_metaf(struct html *h, enum mandoc_esc deco)

 {
 {

-       const char      *rhs;
-       int              i;
-       size_t           sz;
+       enum htmlfont    font;
+
+       switch (deco) {
+       case (ESCAPE_FONTPREV):
+               font = h->metal;
+               break;
+       case (ESCAPE_FONTITALIC):
+               font = HTMLFONT_ITALIC;
+               break;
+       case (ESCAPE_FONTBOLD):
+               font = HTMLFONT_BOLD;
+               break;
+       case (ESCAPE_FONT):
+               /* FALLTHROUGH */
+       case (ESCAPE_FONTROMAN):
+               font = HTMLFONT_NONE;
+               break;
+       default:
+               abort();
+               /* NOTREACHED */
+       }

 
 

-       rhs = chars_a2ascii(h->symtab, p, (size_t)len, &sz);
+       if (h->metaf) {
+               print_tagq(h, h->metaf);
+               h->metaf = NULL;
+       }

 
 

-       if (NULL == rhs) 
-               return;
-       for (i = 0; i < (int)sz; i++) 
-               putchar(rhs[i]);
-}
+       h->metal = h->metac;
+       h->metac = font;

 
 

+       if (HTMLFONT_NONE != font)
+               h->metaf = HTMLFONT_BOLD == font ?
+                       print_otag(h, TAG_B, 0, NULL) :
+                       print_otag(h, TAG_I, 0, NULL);
+}

 
 

-static void
-print_res(struct html *h, const char *p, int len)
+int
+html_strlen(const char *cp)

 {
 {

-       const char      *rhs;
-       int              i;
-       size_t           sz;
-
-       rhs = chars_a2res(h->symtab, p, (size_t)len, &sz);
+       int              ssz, sz;
+       const char      *seq, *p;
+
+       /*
+        * Account for escaped sequences within string length
+        * calculations.  This follows the logic in term_strlen() as we
+        * must calculate the width of produced strings.
+        * Assume that characters are always width of "1".  This is
+        * hacky, but it gets the job done for approximation of widths.
+        */
+
+       sz = 0;
+       while (NULL != (p = strchr(cp, '\\'))) {
+               sz += (int)(p - cp);
+               ++cp;
+               switch (mandoc_escape(&cp, &seq, &ssz)) {
+               case (ESCAPE_ERROR):
+                       return(sz);
+               case (ESCAPE_UNICODE):
+                       /* FALLTHROUGH */
+               case (ESCAPE_NUMBERED):
+                       /* FALLTHROUGH */
+               case (ESCAPE_SPECIAL):
+                       sz++;
+                       break;
+               default:
+                       break;
+               }
+       }

 
 

-       if (NULL == rhs)
-               return;
-       for (i = 0; i < (int)sz; i++) 
-               putchar(rhs[i]);
+       assert(sz >= 0);
+       return(sz + strlen(cp));

 }
 
 }
 

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

 {
 {

-       int              j, type;
-       const char      *wp;
+       size_t           sz;
+       int              c, len, nospace;
+       const char      *seq;
+       enum mandoc_esc  esc;
+       static const char rejs[6] = { '\\', '<', '>', '&', ASCII_HYPH, '\0' };

 
 

-       wp = *p;
-       type = 1;
+       nospace = 0;

 
 

-       if (0 == *(++wp)) {
-               *p = wp;
-               return;
-       }
+       while ('\0' != *p) {
+               sz = strcspn(p, rejs);

 
 

-       if ('(' == *wp) {
-               wp++;
-               if (0 == *wp || 0 == *(wp + 1)) {
-                       *p = 0 == *wp ? wp : wp + 1;
-                       return;
-               }
+               fwrite(p, 1, sz, stdout);
+               p += (int)sz;

 
 

-               print_spec(h, wp, 2);
-               *p = ++wp;
-               return;
+               if ('\0' == *p)
+                       break;

 
 

-       } else if ('*' == *wp) {
-               if (0 == *(++wp)) {
-                       *p = wp;
-                       return;
+               switch (*p++) {
+               case ('<'):
+                       printf("&lt;");
+                       continue;
+               case ('>'):
+                       printf("&gt;");
+                       continue;
+               case ('&'):
+                       printf("&amp;");
+                       continue;
+               case (ASCII_HYPH):
+                       putchar('-');
+                       continue;
+               default:
+                       break;

                }
 
                }
 

-               switch (*wp) {
-               case ('('):
-                       wp++;
-                       if (0 == *wp || 0 == *(wp + 1)) {
-                               *p = 0 == *wp ? wp : wp + 1;
-                               return;
-                       }
-
-                       print_res(h, wp, 2);
-                       *p = ++wp;
-                       return;
-               case ('['):
-                       type = 0;
+               esc = mandoc_escape(&p, &seq, &len);
+               if (ESCAPE_ERROR == esc)

                        break;
                        break;

-               default:
-                       print_res(h, wp, 1);
-                       *p = wp;
-                       return;
-               }
-       
-       } else if ('f' == *wp) {
-               if (0 == *(++wp)) {
-                       *p = wp;
-                       return;
-               }

 
 

-               switch (*wp) {
-               case ('B'):
-                       /* TODO */
+               switch (esc) {
+               case (ESCAPE_UNICODE):
+                       /* Skip passed "u" header. */
+                       c = mchars_num2uc(seq + 1, len - 1);
+                       if ('\0' != c)
+                               printf("&#x%x;", c);
+                       break;
+               case (ESCAPE_NUMBERED):
+                       c = mchars_num2char(seq, len);
+                       if ('\0' != c)
+                               putchar(c);

                        break;
                        break;

-               case ('I'):
-                       /* TODO */
+               case (ESCAPE_SPECIAL):
+                       c = mchars_spec2cp(h->symtab, seq, len);
+                       if (c > 0)
+                               printf("&#%d;", c);
+                       else if (-1 == c && 1 == len)
+                               putchar((int)*seq);

                        break;
                        break;

-               case ('P'):
+               case (ESCAPE_FONT):
+                       /* FALLTHROUGH */
+               case (ESCAPE_FONTPREV):

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case ('R'):
-                       /* TODO */
+               case (ESCAPE_FONTBOLD):
+                       /* FALLTHROUGH */
+               case (ESCAPE_FONTITALIC):
+                       /* FALLTHROUGH */
+               case (ESCAPE_FONTROMAN):
+                       if (norecurse)
+                               break;
+                       print_metaf(h, esc);
+                       break;
+               case (ESCAPE_NOSPACE):
+                       if ('\0' == *p)
+                               nospace = 1;

                        break;
                default:
                        break;
                }
                        break;
                default:
                        break;
                }

-
-               *p = wp;
-               return;
-
-       } else if ('[' != *wp) {
-               print_spec(h, wp, 1);
-               *p = wp;
-               return;

        }
 
        }
 

-       wp++;
-       for (j = 0; *wp && ']' != *wp; wp++, j++)
-               /* Loop... */ ;
-
-       if (0 == *wp) {
-               *p = wp;
-               return;
-       }
-
-       if (type)
-               print_spec(h, wp - j, j);
-       else
-               print_res(h, wp - j, j);
-
-       *p = wp;
+       return(nospace);

 }
 
 
 static void
 }
 
 
 static void

-print_encode(struct html *h, const char *p)
+print_attr(struct html *h, const char *key, const char *val)

 {
 {

-
-       for (; *p; p++) {
-               if ('\\' == *p) {
-                       print_escape(h, &p);
-                       continue;
-               }
-               switch (*p) {
-               case ('<'):
-                       printf("&lt;");
-                       break;
-               case ('>'):
-                       printf("&gt;");
-                       break;
-               case ('&'):
-                       printf("&amp;");
-                       break;
-               default:
-                       putchar(*p);
-                       break;
-               }
-       }
+       printf(" %s=\"", key);
+       (void)print_encode(h, val, 1);
+       putchar('\"');

 }
 
 
 }
 
 


@@ -345,112 +394,135 @@ print_otag(struct html *h, enum htmltag tag,
        int              i;
        struct tag      *t;
 
        int              i;
        struct tag      *t;
 

+       /* Push this tags onto the stack of open scopes. */
+

        if ( ! (HTML_NOSTACK & htmltags[tag].flags)) {
        if ( ! (HTML_NOSTACK & htmltags[tag].flags)) {

-               if (NULL == (t = malloc(sizeof(struct tag))))
-                       err(EXIT_FAILURE, "malloc");
+               t = mandoc_malloc(sizeof(struct tag));

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

-               SLIST_INSERT_HEAD(&h->tags, t, entry);
+               t->next = h->tags.head;
+               h->tags.head = t;

        } else
                t = NULL;
 
        if ( ! (HTML_NOSPACE & h->flags))
        } else
                t = NULL;
 
        if ( ! (HTML_NOSPACE & h->flags))

-               if ( ! (HTML_CLRLINE & htmltags[tag].flags))
-                       printf(" ");
+               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;
+
+       /* Print out the tag name and attributes. */

 
        printf("<%s", htmltags[tag].name);
 
        printf("<%s", htmltags[tag].name);

-       for (i = 0; i < sz; i++) {
-               printf(" %s=\"", htmlattrs[p[i].key]);
-               assert(p->val);
-               print_encode(h, p[i].val);
-               printf("\"");
+       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");

        }
        }

-       printf(">");
+
+       /* Accommodate 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('>');

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

-       if (HTML_CLRLINE & htmltags[tag].flags)
-               h->flags |= HTML_NEWLINE;
-       else
-               h->flags &= ~HTML_NEWLINE;
+
+       if ((HTML_AUTOCLOSE | HTML_CLRLINE) & htmltags[tag].flags)
+               putchar('\n');

 
        return(t);
 }
 
 
 
        return(t);
 }
 
 

-/* ARGSUSED */

 static void
 print_ctag(struct html *h, enum htmltag tag)
 {
        
        printf("</%s>", htmltags[tag].name);
 static void
 print_ctag(struct html *h, enum htmltag tag)
 {
        
        printf("</%s>", htmltags[tag].name);

-       if (HTML_CLRLINE & htmltags[tag].flags)
+       if (HTML_CLRLINE & htmltags[tag].flags) {

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

-       if (HTML_CLRLINE & htmltags[tag].flags)
-               h->flags |= HTML_NEWLINE;
-       else
-               h->flags &= ~HTML_NEWLINE;
+               putchar('\n');
+       } 

 }
 
 }
 

-
-/* ARGSUSED */

 void
 void

-print_gen_doctype(struct html *h)
+print_gen_decls(struct html *h)

 {
 {

-       
-       printf("<!DOCTYPE HTML PUBLIC \"%s\" \"%s\">", DOCTYPE, DTD);
-}
+       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:
+               puts("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+               name = "html";
+               doctype = "-//W3C//DTD XHTML 1.0 Strict//EN";
+               dtd = "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";
+               break;
+       }

 
 

+       printf("<!DOCTYPE %s PUBLIC \"%s\" \"%s\">\n", 
+                       name, doctype, dtd);
+}

 
 void
 
 void

-print_text(struct html *h, const char *p)
+print_text(struct html *h, const char *word)

 {
 
 {
 

-       if (*p && 0 == *(p + 1))
-               switch (*p) {
-               case('.'):
-                       /* FALLTHROUGH */
-               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;");
+       }

 
 

-       if ( ! (h->flags & HTML_NOSPACE))
-               printf(" ");
+       assert(NULL == h->metaf);
+       if (HTMLFONT_NONE != h->metac)
+               h->metaf = HTMLFONT_BOLD == h->metac ?
+                       print_otag(h, TAG_B, 0, NULL) :
+                       print_otag(h, TAG_I, 0, NULL);

 
 

-       h->flags &= ~HTML_NOSPACE;
-       h->flags &= ~HTML_NEWLINE;
+       assert(word);
+       if ( ! print_encode(h, word, 0))
+               if ( ! (h->flags & HTML_NONOSPACE))
+                       h->flags &= ~HTML_NOSPACE;

 
 

-       if (p)
-               print_encode(h, p);
+       if (h->metaf) {
+               print_tagq(h, h->metaf);
+               h->metaf = NULL;
+       }

 
 

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

 }
 
 
 }
 
 


@@ -459,10 +531,17 @@ print_tagq(struct html *h, const struct tag *until)
 {
        struct tag      *tag;
 
 {
        struct tag      *tag;
 

-       while ( ! SLIST_EMPTY(&h->tags)) {
-               tag = SLIST_FIRST(&h->tags);
+       while ((tag = h->tags.head) != NULL) {
+               /* 
+                * Remember to close out and nullify the current
+                * meta-font and table, if applicable.
+                */
+               if (tag == h->metaf)
+                       h->metaf = NULL;
+               if (tag == h->tblt)
+                       h->tblt = NULL;

                print_ctag(h, tag->tag);
                print_ctag(h, tag->tag);

-               SLIST_REMOVE_HEAD(&h->tags, entry);
+               h->tags.head = tag->next;

                free(tag);
                if (until && tag == until)
                        return;
                free(tag);
                if (until && tag == until)
                        return;


@@ -475,12 +554,141 @@ print_stagq(struct html *h, const struct tag *suntil)
 {
        struct tag      *tag;
 
 {
        struct tag      *tag;
 

-       while ( ! SLIST_EMPTY(&h->tags)) {
-               tag = SLIST_FIRST(&h->tags);
+       while ((tag = h->tags.head) != NULL) {

                if (suntil && tag == suntil)
                        return;
                if (suntil && tag == suntil)
                        return;

+               /* 
+                * Remember to close out and nullify the current
+                * meta-font and table, if applicable.
+                */
+               if (tag == h->metaf)
+                       h->metaf = NULL;
+               if (tag == h->tblt)
+                       h->tblt = NULL;

                print_ctag(h, tag->tag);
                print_ctag(h, tag->tag);

-               SLIST_REMOVE_HEAD(&h->tags, entry);
+               h->tags.head = tag->next;

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

+
+void
+bufinit(struct html *h)
+{
+
+       h->buf[0] = '\0';
+       h->buflen = 0;
+}
+
+void
+bufcat_style(struct html *h, const char *key, const char *val)
+{
+
+       bufcat(h, key);
+       bufcat(h, ":");
+       bufcat(h, val);
+       bufcat(h, ";");
+}
+
+void
+bufcat(struct html *h, const char *p)
+{
+
+       h->buflen = strlcat(h->buf, p, BUFSIZ);
+       assert(h->buflen < BUFSIZ);
+       h->buflen--;
+}
+
+void
+bufcat_fmt(struct html *h, const char *fmt, ...)
+{
+       va_list          ap;
+
+       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);
+}
+
+static void
+bufncat(struct html *h, const char *p, size_t sz)
+{
+
+       assert(h->buflen + sz + 1 < BUFSIZ);
+       strncat(h->buf, p, sz);
+       h->buflen += sz;
+}
+
+void
+buffmt_includes(struct html *h, const char *name)
+{
+       const char      *p, *pp;
+
+       pp = h->base_includes;
+       
+       bufinit(h);
+       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);
+}
+
+void
+buffmt_man(struct html *h, 
+               const char *name, const char *sec)
+{
+       const char      *p, *pp;
+
+       pp = h->base_man;
+       
+       bufinit(h);
+       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'):
+                       bufcat_fmt(h, name);
+                       break;
+               default:
+                       bufncat(h, p, 2);
+                       break;
+               }
+               pp = p + 2;
+       }
+       if (pp)
+               bufcat(h, pp);
+}
+
+void
+bufcat_su(struct html *h, const char *p, const struct roffsu *su)
+{
+       double           v;
+
+       v = su->scale;
+       if (SCALE_MM == su->unit && 0.0 == (v /= 100.0))
+               v = 1.0;
+
+       bufcat_fmt(h, "%s: %.2f%s;", p, v, roffscales[su->unit]);
+}
+
+void
+bufcat_id(struct html *h, const char *src)
+{
+
+       /* Cf. <http://www.w3.org/TR/html4/types.html#h-6.2>. */
+
+       while ('\0' != *src)
+               bufcat_fmt(h, "%.2x", *src++);
+}