]> 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
Clean-up fallout: differentiate ID's and HREF's (where to put the `#').
[mandoc.git] / html.c
diff --git a/html.c b/html.c
index ff71f2531719839caf9ad44b41b8c9ba32fbd09e..a50d2eb03adab1d2b14a203b52204e2fccf67d91 100644 (file)
--- a/html.c
+++ b/html.c
@@ -1,6 +1,7 @@
-/*     $Id: html.c,v 1.86 2009/11/14 12:00:24 kristaps Exp $ */
+/*     $Id: html.c,v 1.143 2011/05/17 11:38:18 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,6 +15,10 @@
  * 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 <assert.h>
 #include <sys/types.h>
 
 #include <assert.h>
@@ -25,77 +30,94 @@
 #include <string.h>
 #include <unistd.h>
 
 #include <string.h>
 #include <unistd.h>
 
+#include "mandoc.h"
+#include "libmandoc.h"
 #include "out.h"
 #include "out.h"
-#include "chars.h"
 #include "html.h"
 #include "main.h"
 
 #include "html.h"
 #include "main.h"
 
-#define        UNCONST(a)      ((void *)(uintptr_t)(const void *)(a))
-
-#define        DOCTYPE         "-//W3C//DTD HTML 4.01//EN"
-#define        DTD             "http://www.w3.org/TR/html4/strict.dtd"
-
 struct htmldata {
        const char       *name;
        int               flags;
 #define        HTML_CLRLINE     (1 << 0)
 #define        HTML_NOSTACK     (1 << 1)
 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 */
 };
 
 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] = {
 };
 
 static const char      *const htmlattrs[ATTR_MAX] = {
-       "http-equiv",
-       "content",
-       "name",
-       "rel",
-       "href",
-       "type",
-       "media",
-       "class",
-       "style",
-       "width",
-       "valign",
-       "target",
-       "id",
-       "summary",
+       "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 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 int               print_encode(struct html *, const char *);
-
+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_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 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;
        const char      *toks[4];
 {
        struct html     *h;
        const char      *toks[4];
@@ -106,15 +128,11 @@ html_alloc(char *outopts)
        toks[2] = "includes";
        toks[3] = NULL;
 
        toks[2] = "includes";
        toks[3] = NULL;
 
-       h = calloc(1, sizeof(struct html));
-       if (NULL == h) {
-               perror(NULL);
-               exit(EXIT_FAILURE);
-       }
+       h = mandoc_calloc(1, sizeof(struct html));
 
 
+       h->type = type;
        h->tags.head = NULL;
        h->tags.head = NULL;
-       h->ords.head = NULL;
-       h->symtab = chars_init(CHARS_HTML);
+       h->symtab = mchars_alloc();
 
        while (outopts && *outopts)
                switch (getsubopt(&outopts, UNCONST(toks), &v)) {
 
        while (outopts && *outopts)
                switch (getsubopt(&outopts, UNCONST(toks), &v)) {
@@ -134,28 +152,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 ((ord = h->ords.head) != NULL) { 
-               h->ords.head = ord->next;
-               free(ord);
-       }
-
        while ((tag = h->tags.head) != NULL) {
                h->tags.head = tag->next;       
                free(tag);
        }
        
        if (h->symtab)
        while ((tag = h->tags.head) != NULL) {
                h->tags.head = tag->next;       
                free(tag);
        }
        
        if (h->symtab)
-               chars_free(h->symtab);
+               mchars_free(h->symtab);
 
        free(h);
 }
 
        free(h);
 }
@@ -191,88 +218,205 @@ print_gen_head(struct html *h)
        }
 }
 
        }
 }
 
-
 static void
 print_spec(struct html *h, const char *p, size_t len)
 {
 static void
 print_spec(struct html *h, const char *p, size_t len)
 {
+       int              cp;
        const char      *rhs;
        size_t           sz;
 
        const char      *rhs;
        size_t           sz;
 
-       rhs = chars_a2ascii(h->symtab, p, len, &sz);
-
-       if (NULL == rhs) 
+       if ((cp = mchars_spec2cp(h->symtab, p, len)) > 0) {
+               printf("&#%d;", cp);
+               return;
+       } else if (-1 == cp && 1 == len) {
+               fwrite(p, 1, len, stdout);
                return;
                return;
-       fwrite(rhs, 1, sz, stdout);
+       } else if (-1 == cp)
+               return;
+
+       if (NULL != (rhs = mchars_spec2str(h->symtab, p, len, &sz)))
+               fwrite(rhs, 1, sz, stdout);
 }
 
 
 static void
 print_res(struct html *h, const char *p, size_t len)
 {
 }
 
 
 static void
 print_res(struct html *h, const char *p, size_t len)
 {
+       int              cp;
        const char      *rhs;
        size_t           sz;
 
        const char      *rhs;
        size_t           sz;
 
-       rhs = chars_a2res(h->symtab, p, len, &sz);
-
-       if (NULL == rhs)
+       if ((cp = mchars_res2cp(h->symtab, p, len)) > 0) {
+               printf("&#%d;", cp);
+               return;
+       } else if (-1 == cp)
                return;
                return;
-       fwrite(rhs, 1, sz, stdout);
+
+       if (NULL != (rhs = mchars_res2str(h->symtab, p, len, &sz)))
+               fwrite(rhs, 1, sz, stdout);
+}
+
+
+static void
+print_metaf(struct html *h, enum mandoc_esc deco)
+{
+       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_FONTROMAN):
+               font = HTMLFONT_NONE;
+               break;
+       default:
+               abort();
+               /* NOTREACHED */
+       }
+
+       if (h->metaf) {
+               print_tagq(h, h->metaf);
+               h->metaf = NULL;
+       }
+
+       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);
 }
 
 }
 
+int
+html_strlen(const char *cp)
+{
+       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_NUMBERED):
+                       /* FALLTHROUGH */
+               case (ESCAPE_PREDEF):
+                       /* FALLTHROUGH */
+               case (ESCAPE_SPECIAL):
+                       sz++;
+                       break;
+               default:
+                       break;
+               }
+       }
+
+       assert(sz >= 0);
+       return(sz + strlen(cp));
+}
 
 static int
 
 static int
-print_encode(struct html *h, const char *p)
+print_encode(struct html *h, const char *p, int norecurse)
 {
        size_t           sz;
 {
        size_t           sz;
-       int              len, nospace;
+       int              c, len, nospace;
        const char      *seq;
        const char      *seq;
-       enum roffdeco    deco;
+       enum mandoc_esc  esc;
+       static const char rejs[6] = { '\\', '<', '>', '&', ASCII_HYPH, '\0' };
 
        nospace = 0;
 
 
        nospace = 0;
 
-       for (; *p; p++) {
-               sz = strcspn(p, "\\<>&");
+       while ('\0' != *p) {
+               sz = strcspn(p, rejs);
 
                fwrite(p, 1, sz, stdout);
 
                fwrite(p, 1, sz, stdout);
-               p += /* LINTED */
-                       sz;
+               p += (int)sz;
+
+               if ('\0' == *p)
+                       break;
 
 
-               if ('<' == *p) {
+               switch (*p++) {
+               case ('<'):
                        printf("&lt;");
                        continue;
                        printf("&lt;");
                        continue;
-               } else if ('>' == *p) {
+               case ('>'):
                        printf("&gt;");
                        continue;
                        printf("&gt;");
                        continue;
-               } else if ('&' == *p) {
+               case ('&'):
                        printf("&amp;");
                        continue;
                        printf("&amp;");
                        continue;
-               } else if ('\0' == *p)
+               case (ASCII_HYPH):
+                       putchar('-');
+                       continue;
+               default:
                        break;
                        break;
+               }
 
 
-               seq = ++p;
-               len = a2roffdeco(&deco, &seq, &sz);
+               esc = mandoc_escape(&p, &seq, &len);
+               if (ESCAPE_ERROR == esc)
+                       break;
 
 
-               switch (deco) {
-               case (DECO_RESERVED):
-                       print_res(h, seq, sz);
+               switch (esc) {
+               case (ESCAPE_NUMBERED):
+                       c = mchars_num2char(seq, len);
+                       if ('\0' != c)
+                               putchar(c);
+                       break;
+               case (ESCAPE_PREDEF):
+                       print_res(h, seq, len);
+                       break;
+               case (ESCAPE_SPECIAL):
+                       print_spec(h, seq, len);
+                       break;
+               case (ESCAPE_FONTPREV):
+                       /* FALLTHROUGH */
+               case (ESCAPE_FONTBOLD):
+                       /* FALLTHROUGH */
+               case (ESCAPE_FONTITALIC):
+                       /* FALLTHROUGH */
+               case (ESCAPE_FONTROMAN):
+                       if (norecurse)
+                               break;
+                       print_metaf(h, esc);
                        break;
                        break;
-               case (DECO_SPECIAL):
-                       print_spec(h, seq, sz);
+               case (ESCAPE_NOSPACE):
+                       if ('\0' == *p)
+                               nospace = 1;
                        break;
                default:
                        break;
                }
                        break;
                default:
                        break;
                }
-
-               p += len - 1;
-
-               if (DECO_NOSPACE == deco && '\0' == *(p + 1))
-                       nospace = 1;
        }
 
        return(nospace);
 }
 
 
        }
 
        return(nospace);
 }
 
 
+static void
+print_attr(struct html *h, const char *key, const char *val)
+{
+       printf(" %s=\"", key);
+       (void)print_encode(h, val, 1);
+       putchar('\"');
+}
+
+
 struct tag *
 print_otag(struct html *h, enum htmltag tag, 
                int sz, const struct htmlpair *p)
 struct tag *
 print_otag(struct html *h, enum htmltag tag, 
                int sz, const struct htmlpair *p)
@@ -280,12 +424,10 @@ 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)) {
-               t = malloc(sizeof(struct tag));
-               if (NULL == t) {
-                       perror(NULL);
-                       exit(EXIT_FAILURE);
-               }
+               t = mandoc_malloc(sizeof(struct tag));
                t->tag = tag;
                t->next = h->tags.head;
                h->tags.head = t;
                t->tag = tag;
                t->next = h->tags.head;
                h->tags.head = t;
@@ -293,29 +435,57 @@ print_otag(struct html *h, enum htmltag tag,
                t = NULL;
 
        if ( ! (HTML_NOSPACE & h->flags))
                t = NULL;
 
        if ( ! (HTML_NOSPACE & h->flags))
-               if ( ! (HTML_CLRLINE & htmltags[tag].flags))
-                       putchar(' ');
+               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);
-               (void)print_encode(h, p[i].val);
-               putchar('\"');
+       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");
        }
        }
+
+       /* 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;
        putchar('>');
 
        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)
 {
 static void
 print_ctag(struct html *h, enum htmltag tag)
 {
@@ -323,73 +493,66 @@ print_ctag(struct html *h, enum htmltag tag)
        printf("</%s>", htmltags[tag].name);
        if (HTML_CLRLINE & htmltags[tag].flags) {
                h->flags |= HTML_NOSPACE;
        printf("</%s>", htmltags[tag].name);
        if (HTML_CLRLINE & htmltags[tag].flags) {
                h->flags |= HTML_NOSPACE;
-               h->flags |= HTML_NEWLINE;
                putchar('\n');
                putchar('\n');
-       } else
-               h->flags &= ~HTML_NEWLINE;
+       } 
 }
 
 }
 
-
-/* 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))
-               putchar(' ');
+       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_NEWLINE;
+       assert(word);
+       if ( ! print_encode(h, word, 0))
+               if ( ! (h->flags & HTML_NONOSPACE))
+                       h->flags &= ~HTML_NOSPACE;
 
 
-       assert(p);
-       if ( ! print_encode(h, p))
-               h->flags &= ~HTML_NOSPACE;
+       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;
 }
 
 
 }
 
 
@@ -399,6 +562,14 @@ print_tagq(struct html *h, const struct tag *until)
        struct tag      *tag;
 
        while ((tag = h->tags.head) != NULL) {
        struct tag      *tag;
 
        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);
                h->tags.head = tag->next;
                free(tag);
                print_ctag(h, tag->tag);
                h->tags.head = tag->next;
                free(tag);
@@ -416,13 +587,20 @@ print_stagq(struct html *h, const struct tag *suntil)
        while ((tag = h->tags.head) != NULL) {
                if (suntil && tag == suntil)
                        return;
        while ((tag = h->tags.head) != NULL) {
                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);
                h->tags.head = tag->next;
                free(tag);
        }
 }
 
                print_ctag(h, tag->tag);
                h->tags.head = tag->next;
                free(tag);
        }
 }
 
-
 void
 bufinit(struct html *h)
 {
 void
 bufinit(struct html *h)
 {
@@ -431,28 +609,27 @@ bufinit(struct html *h)
        h->buflen = 0;
 }
 
        h->buflen = 0;
 }
 
-
 void
 bufcat_style(struct html *h, const char *key, const char *val)
 {
 
        bufcat(h, key);
 void
 bufcat_style(struct html *h, const char *key, const char *val)
 {
 
        bufcat(h, key);
-       bufncat(h, ":", 1);
+       bufcat(h, ":");
        bufcat(h, val);
        bufcat(h, val);
-       bufncat(h, ";", 1);
+       bufcat(h, ";");
 }
 
 }
 
-
 void
 bufcat(struct html *h, const char *p)
 {
 
 void
 bufcat(struct html *h, const char *p)
 {
 
-       bufncat(h, p, strlen(p));
+       h->buflen = strlcat(h->buf, p, BUFSIZ);
+       assert(h->buflen < BUFSIZ);
+       h->buflen--;
 }
 
 }
 
-
 void
 void
-buffmt(struct html *h, const char *fmt, ...)
+bufcat_fmt(struct html *h, const char *fmt, ...)
 {
        va_list          ap;
 
 {
        va_list          ap;
 
@@ -463,19 +640,15 @@ buffmt(struct html *h, const char *fmt, ...)
        h->buflen = strlen(h->buf);
 }
 
        h->buflen = strlen(h->buf);
 }
 
-
-void
+static void
 bufncat(struct html *h, const char *p, size_t sz)
 {
 
 bufncat(struct html *h, const char *p, size_t sz)
 {
 
-       if (h->buflen + sz > BUFSIZ - 1)
-               sz = BUFSIZ - 1 - h->buflen;
-
-       (void)strncat(h->buf, p, sz);
+       assert(h->buflen + sz + 1 < BUFSIZ);
+       strncat(h->buf, p, sz);
        h->buflen += sz;
 }
 
        h->buflen += sz;
 }
 
-
 void
 buffmt_includes(struct html *h, const char *name)
 {
 void
 buffmt_includes(struct html *h, const char *name)
 {
@@ -483,6 +656,7 @@ buffmt_includes(struct html *h, const char *name)
 
        pp = h->base_includes;
        
 
        pp = h->base_includes;
        
+       bufinit(h);
        while (NULL != (p = strchr(pp, '%'))) {
                bufncat(h, pp, (size_t)(p - pp));
                switch (*(p + 1)) {
        while (NULL != (p = strchr(pp, '%'))) {
                bufncat(h, pp, (size_t)(p - pp));
                switch (*(p + 1)) {
@@ -499,7 +673,6 @@ buffmt_includes(struct html *h, const char *name)
                bufcat(h, pp);
 }
 
                bufcat(h, pp);
 }
 
-
 void
 buffmt_man(struct html *h, 
                const char *name, const char *sec)
 void
 buffmt_man(struct html *h, 
                const char *name, const char *sec)
@@ -508,7 +681,7 @@ buffmt_man(struct html *h,
 
        pp = h->base_man;
        
 
        pp = h->base_man;
        
-       /* LINTED */
+       bufinit(h);
        while (NULL != (p = strchr(pp, '%'))) {
                bufncat(h, pp, (size_t)(p - pp));
                switch (*(p + 1)) {
        while (NULL != (p = strchr(pp, '%'))) {
                bufncat(h, pp, (size_t)(p - pp));
                switch (*(p + 1)) {
@@ -516,7 +689,7 @@ buffmt_man(struct html *h,
                        bufcat(h, sec ? sec : "1");
                        break;
                case('N'):
                        bufcat(h, sec ? sec : "1");
                        break;
                case('N'):
-                       buffmt(h, name);
+                       bufcat_fmt(h, name);
                        break;
                default:
                        bufncat(h, p, 2);
                        break;
                default:
                        bufncat(h, p, 2);
@@ -528,81 +701,24 @@ buffmt_man(struct html *h,
                bufcat(h, pp);
 }
 
                bufcat(h, pp);
 }
 
-
 void
 bufcat_su(struct html *h, const char *p, const struct roffsu *su)
 {
        double           v;
 void
 bufcat_su(struct html *h, const char *p, const struct roffsu *su)
 {
        double           v;
-       const char      *u;
 
        v = su->scale;
 
        v = su->scale;
+       if (SCALE_MM == su->unit && 0.0 == (v /= 100.0))
+               v = 1.0;
 
 
-       switch (su->unit) {
-       case (SCALE_CM):
-               u = "cm";
-               break;
-       case (SCALE_IN):
-               u = "in";
-               break;
-       case (SCALE_PC):
-               u = "pc";
-               break;
-       case (SCALE_PT):
-               u = "pt";
-               break;
-       case (SCALE_EM):
-               u = "em";
-               break;
-       case (SCALE_MM):
-               if (0 == (v /= 100))
-                       v = 1;
-               u = "em";
-               break;
-       case (SCALE_EN):
-               u = "ex";
-               break;
-       case (SCALE_BU):
-               u = "ex";
-               break;
-       case (SCALE_VS):
-               u = "em";
-               break;
-       default:
-               u = "ex";
-               break;
-       }
-
-       if (su->pt)
-               buffmt(h, "%s: %f%s;", p, v, u);
-       else
-               /* LINTED */
-               buffmt(h, "%s: %d%s;", p, (int)v, u);
+       bufcat_fmt(h, "%s: %.2f%s;", p, v, roffscales[su->unit]);
 }
 
 }
 
-
 void
 void
-html_idcat(char *dst, const char *src, int sz)
+bufcat_id(struct html *h, const char *src)
 {
 {
-       int              ssz;
-
-       assert(sz);
 
        /* Cf. <http://www.w3.org/TR/html4/types.html#h-6.2>. */
 
 
        /* Cf. <http://www.w3.org/TR/html4/types.html#h-6.2>. */
 
-       for ( ; *dst != '\0' && sz; dst++, sz--)
-               /* Jump to end. */ ;
-
-       assert(sz > 2);
-
-       /* We can't start with a number (bah). */
-
-       *dst++ = 'x';
-       *dst = '\0';
-       sz--;
-
-       for ( ; *src != '\0' && sz > 1; src++) {
-               ssz = snprintf(dst, (size_t)sz, "%.2x", *src);
-               sz -= ssz;
-               dst += ssz;
-       }
+       while ('\0' != *src)
+               bufcat_fmt(h, "%.2x", *src++);
 }
 }
A git conversion mirror of mandoc.bsd.lv