]> 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 markup of .Bd, .D1, .Dl, .Li, and .Ql;
[mandoc.git] / html.c
diff --git a/html.c b/html.c
index f3c4b9140a534140887714c6e58768a382bec6cb..fcb2e876ceea63c62832925e44b4e043c76ae4b9 100644 (file)
--- a/html.c
+++ b/html.c
@@ -1,15 +1,15 @@
-/*     $Id: html.c,v 1.165 2014/09/27 09:02:19 kristaps Exp $ */
+/*     $Id: html.c,v 1.199 2017/01/19 16:59:30 schwarze Exp $ */
 /*
 /*
- * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2011-2015, 2017 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
  * 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
@@ -30,69 +30,73 @@
 
 #include "mandoc.h"
 #include "mandoc_aux.h"
 
 #include "mandoc.h"
 #include "mandoc_aux.h"
-#include "libmandoc.h"
 #include "out.h"
 #include "html.h"
 #include "out.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_NOSTACK     (1 << 0)
+#define        HTML_AUTOCLOSE   (1 << 1)
+#define        HTML_NLBEFORE    (1 << 2)
+#define        HTML_NLBEGIN     (1 << 3)
+#define        HTML_NLEND       (1 << 4)
+#define        HTML_NLAFTER     (1 << 5)
+#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 << 6)
+#define        HTML_NOINDENT    (1 << 7)
 };
 
 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 */
-       {"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 */
-       {"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 */
-       {"style",       HTML_CLRLINE}, /* TAG_STYLE */
-};
-
-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 */
-       "charset", /* ATTR_CHARSET */
+       {"html",        HTML_NLALL},
+       {"head",        HTML_NLALL | HTML_INDENT},
+       {"body",        HTML_NLALL},
+       {"meta",        HTML_NOSTACK | HTML_AUTOCLOSE | HTML_NLALL},
+       {"title",       HTML_NLAROUND},
+       {"div",         HTML_NLAROUND},
+       {"h1",          HTML_NLAROUND},
+       {"h2",          HTML_NLAROUND},
+       {"span",        0},
+       {"link",        HTML_NOSTACK | HTML_AUTOCLOSE | HTML_NLALL},
+       {"br",          HTML_NOSTACK | HTML_AUTOCLOSE | HTML_NLALL},
+       {"a",           0},
+       {"table",       HTML_NLALL | HTML_INDENT},
+       {"tbody",       HTML_NLALL | HTML_INDENT},
+       {"col",         HTML_NOSTACK | HTML_AUTOCLOSE | HTML_NLALL},
+       {"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},
+       {"pre",         HTML_NLALL | HTML_NOINDENT},
+       {"b",           0},
+       {"i",           0},
+       {"code",        0},
+       {"small",       0},
+       {"style",       HTML_NLALL | HTML_INDENT},
+       {"math",        HTML_NLALL | HTML_INDENT},
+       {"mrow",        0},
+       {"mi",          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 roffscales[SCALE_MAX] = {
 };
 
 static const char      *const roffscales[SCALE_MAX] = {
@@ -108,67 +112,35 @@ static    const char      *const roffscales[SCALE_MAX] = {
        "ex", /* SCALE_FS */
 };
 
        "ex", /* SCALE_FS */
 };
 
-static void     bufncat(struct html *, const char *, size_t);
-static void     print_ctag(struct html *, enum htmltag);
-static int      print_escape(char);
-static int      print_encode(struct html *, const char *, int);
+static void     a2width(const char *, struct roffsu *);
+static void     print_byte(struct html *, char);
+static void     print_endline(struct html *);
+static void     print_endword(struct html *);
+static void     print_indent(struct html *);
+static void     print_word(struct html *, const char *);
+
+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 *, enum mandoc_esc);
 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)
+void *
+html_alloc(const struct manoutput *outopts)
 {
        struct html     *h;
 {
        struct html     *h;
-       const char      *toks[5];
-       char            *v;
-
-       toks[0] = "style";
-       toks[1] = "man";
-       toks[2] = "includes";
-       toks[3] = "fragment";
-       toks[4] = NULL;
 
        h = mandoc_calloc(1, sizeof(struct html));
 
 
        h = mandoc_calloc(1, sizeof(struct html));
 
-       h->type = type;
        h->tags.head = NULL;
        h->tags.head = NULL;
-       h->symtab = mchars_alloc();
-
-       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;
-               case 3:
-                       h->oflags |= HTML_FRAGMENT;
-                       break;
-               default:
-                       break;
-               }
-
-       return(h);
-}
-
-void *
-html_alloc(char *outopts)
-{
-
-       return(ml_alloc(outopts, HTML_HTML_4_01_STRICT));
-}
-
-void *
-xhtml_alloc(char *outopts)
-{
+       h->style = outopts->style;
+       h->base_man = outopts->man;
+       h->base_includes = outopts->includes;
+       if (outopts->fragment)
+               h->oflags |= HTML_FRAGMENT;
 
 
-       return(ml_alloc(outopts, HTML_XHTML_1_0_STRICT));
+       return h;
 }
 
 void
 }
 
 void
@@ -184,37 +156,37 @@ html_free(void *p)
                free(tag);
        }
 
                free(tag);
        }
 
-       if (h->symtab)
-               mchars_free(h->symtab);
-
        free(h);
 }
 
 void
 print_gen_head(struct html *h)
 {
        free(h);
 }
 
 void
 print_gen_head(struct html *h)
 {
-       struct htmlpair  tag[4];
        struct tag      *t;
 
        struct tag      *t;
 
-       tag[0].key = ATTR_CHARSET;
-       tag[0].val = "utf-8";
-       print_otag(h, TAG_META, 1, tag);
+       print_otag(h, TAG_META, "?", "charset", "utf-8");
+
+       /*
+        * Print a default style-sheet.
+        */
 
 
-       t = print_otag(h, TAG_STYLE, 0, NULL);
-       print_text(h, "table.head, table.foot { width: 100%; }\n");
+       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, "table.foot td { width: 50%; }");
+       print_endline(h);
+       print_text(h, "table.head td { width: 33%; }");
+       print_endline(h);
+       print_text(h, "div.Pp { margin: 1ex 0ex; }");
        print_tagq(h, t);
 
        print_tagq(h, t);
 
-       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);
-       }
+       if (h->style)
+               print_otag(h, TAG_LINK, "?h??", "rel", "stylesheet",
+                   h->style, "type", "text/css", "media", "all");
 }
 
 static void
 }
 
 static void
@@ -236,13 +208,11 @@ print_metaf(struct html *h, enum mandoc_esc deco)
                font = HTMLFONT_BI;
                break;
        case ESCAPE_FONT:
                font = HTMLFONT_BI;
                break;
        case ESCAPE_FONT:
-               /* FALLTHROUGH */
        case ESCAPE_FONTROMAN:
                font = HTMLFONT_NONE;
                break;
        default:
                abort();
        case ESCAPE_FONTROMAN:
                font = HTMLFONT_NONE;
                break;
        default:
                abort();
-               /* NOTREACHED */
        }
 
        if (h->metaf) {
        }
 
        if (h->metaf) {
@@ -255,14 +225,14 @@ print_metaf(struct html *h, enum mandoc_esc deco)
 
        switch (font) {
        case HTMLFONT_ITALIC:
 
        switch (font) {
        case HTMLFONT_ITALIC:
-               h->metaf = print_otag(h, TAG_I, 0, NULL);
+               h->metaf = print_otag(h, TAG_I, "");
                break;
        case HTMLFONT_BOLD:
                break;
        case HTMLFONT_BOLD:
-               h->metaf = print_otag(h, TAG_B, 0, NULL);
+               h->metaf = print_otag(h, TAG_B, "");
                break;
        case HTMLFONT_BI:
                break;
        case HTMLFONT_BI:
-               h->metaf = print_otag(h, TAG_B, 0, NULL);
-               print_otag(h, TAG_I, 0, NULL);
+               h->metaf = print_otag(h, TAG_B, "");
+               print_otag(h, TAG_I, "");
                break;
        default:
                break;
                break;
        default:
                break;
@@ -300,12 +270,11 @@ html_strlen(const char *cp)
                cp++;
                switch (mandoc_escape(&cp, NULL, NULL)) {
                case ESCAPE_ERROR:
                cp++;
                switch (mandoc_escape(&cp, NULL, NULL)) {
                case ESCAPE_ERROR:
-                       return(sz);
+                       return sz;
                case ESCAPE_UNICODE:
                case ESCAPE_UNICODE:
-                       /* FALLTHROUGH */
                case ESCAPE_NUMBERED:
                case ESCAPE_NUMBERED:
-                       /* FALLTHROUGH */
                case ESCAPE_SPECIAL:
                case ESCAPE_SPECIAL:
+               case ESCAPE_OVERSTRIKE:
                        if (skip)
                                skip = 0;
                        else
                        if (skip)
                                skip = 0;
                        else
@@ -318,43 +287,44 @@ html_strlen(const char *cp)
                        break;
                }
        }
                        break;
                }
        }
-       return(sz);
+       return sz;
 }
 
 static int
 }
 
 static int
-print_escape(char c)
+print_escape(struct html *h, char c)
 {
 
        switch (c) {
        case '<':
 {
 
        switch (c) {
        case '<':
-               printf("&lt;");
+               print_word(h, "&lt;");
                break;
        case '>':
                break;
        case '>':
-               printf("&gt;");
+               print_word(h, "&gt;");
                break;
        case '&':
                break;
        case '&':
-               printf("&amp;");
+               print_word(h, "&amp;");
                break;
        case '"':
                break;
        case '"':
-               printf("&quot;");
+               print_word(h, "&quot;");
                break;
        case ASCII_NBRSP:
                break;
        case ASCII_NBRSP:
-               putchar('-');
+               print_word(h, "&nbsp;");
                break;
        case ASCII_HYPH:
                break;
        case ASCII_HYPH:
-               putchar('-');
-               /* FALLTHROUGH */
+               print_byte(h, '-');
+               break;
        case ASCII_BREAK:
                break;
        default:
        case ASCII_BREAK:
                break;
        default:
-               return(0);
+               return 0;
        }
        }
-       return(1);
+       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)
 {
 {
+       char             numbuf[16];
        size_t           sz;
        int              c, len, nospace;
        const char      *seq;
        size_t           sz;
        int              c, len, nospace;
        const char      *seq;
@@ -362,24 +332,28 @@ print_encode(struct html *h, const char *p, int norecurse)
        static const char rejs[9] = { '\\', '<', '>', '&', '"',
                ASCII_NBRSP, ASCII_HYPH, ASCII_BREAK, '\0' };
 
        static const char rejs[9] = { '\\', '<', '>', '&', '"',
                ASCII_NBRSP, ASCII_HYPH, ASCII_BREAK, '\0' };
 
+       if (pend == NULL)
+               pend = strchr(p, '\0');
+
        nospace = 0;
 
        nospace = 0;
 
-       while ('\0' != *p) {
+       while (p < pend) {
                if (HTML_SKIPCHAR & h->flags && '\\' != *p) {
                        h->flags &= ~HTML_SKIPCHAR;
                        p++;
                        continue;
                }
 
                if (HTML_SKIPCHAR & h->flags && '\\' != *p) {
                        h->flags &= ~HTML_SKIPCHAR;
                        p++;
                        continue;
                }
 
-               sz = strcspn(p, rejs);
-
-               fwrite(p, 1, sz, stdout);
-               p += (int)sz;
+               for (sz = strcspn(p, rejs); sz-- && p < pend; p++)
+                       if (*p == ' ')
+                               print_endword(h);
+                       else
+                               print_byte(h, *p);
 
 
-               if ('\0' == *p)
+               if (p >= pend)
                        break;
 
                        break;
 
-               if (print_escape(*p++))
+               if (print_escape(h, *p++))
                        continue;
 
                esc = mandoc_escape(&p, &seq, &len);
                        continue;
 
                esc = mandoc_escape(&p, &seq, &len);
@@ -388,15 +362,10 @@ print_encode(struct html *h, const char *p, int norecurse)
 
                switch (esc) {
                case ESCAPE_FONT:
 
                switch (esc) {
                case ESCAPE_FONT:
-                       /* FALLTHROUGH */
                case ESCAPE_FONTPREV:
                case ESCAPE_FONTPREV:
-                       /* FALLTHROUGH */
                case ESCAPE_FONTBOLD:
                case ESCAPE_FONTBOLD:
-                       /* FALLTHROUGH */
                case ESCAPE_FONTITALIC:
                case ESCAPE_FONTITALIC:
-                       /* FALLTHROUGH */
                case ESCAPE_FONTBI:
                case ESCAPE_FONTBI:
-                       /* FALLTHROUGH */
                case ESCAPE_FONTROMAN:
                        if (0 == norecurse)
                                print_metaf(h, esc);
                case ESCAPE_FONTROMAN:
                        if (0 == norecurse)
                                print_metaf(h, esc);
@@ -417,52 +386,83 @@ print_encode(struct html *h, const char *p, int norecurse)
                case ESCAPE_UNICODE:
                        /* Skip past "u" header. */
                        c = mchars_num2uc(seq + 1, len - 1);
                case ESCAPE_UNICODE:
                        /* Skip past "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);
                        break;
                case ESCAPE_NUMBERED:
                        c = mchars_num2char(seq, len);
-                       if ( ! ('\0' == c || print_escape(c)))
-                               putchar(c);
+                       if (c < 0)
+                               continue;
                        break;
                case ESCAPE_SPECIAL:
                        break;
                case ESCAPE_SPECIAL:
-                       c = mchars_spec2cp(h->symtab, seq, len);
-                       if (c > 0)
-                               printf("&#%d;", c);
-                       else if (-1 == c && 1 == len &&
-                           !print_escape(*seq))
-                               putchar((int)*seq);
+                       c = mchars_spec2cp(seq, len);
+                       if (c <= 0)
+                               continue;
                        break;
                case ESCAPE_NOSPACE:
                        if ('\0' == *p)
                                nospace = 1;
                        break;
                case ESCAPE_NOSPACE:
                        if ('\0' == *p)
                                nospace = 1;
+                       continue;
+               case ESCAPE_OVERSTRIKE:
+                       if (len == 0)
+                               continue;
+                       c = seq[len - 1];
                        break;
                default:
                        break;
                default:
-                       break;
+                       continue;
                }
                }
+               if ((c < 0x20 && c != 0x09) ||
+                   (c > 0x7E && c < 0xA0))
+                       c = 0xFFFD;
+               if (c > 0x7E) {
+                       (void)snprintf(numbuf, sizeof(numbuf), "&#%d;", 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('\"');
+       const char      *p, *pp;
+
+       pp = man ? h->base_man : 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 roffsu    mysu, *su;
+       char             numbuf[16];
        struct tag      *t;
        struct tag      *t;
+       const char      *attr;
+       char            *s;
+       double           v;
+       int              i, have_style, tflags;
+
+       tflags = htmltags[tag].flags;
 
        /* Push this tags onto the stack of open scopes. */
 
 
        /* Push this tags onto the stack of open scopes. */
 
-       if ( ! (HTML_NOSTACK & htmltags[tag].flags)) {
+       if ((tflags & HTML_NOSTACK) == 0) {
                t = mandoc_malloc(sizeof(struct tag));
                t->tag = tag;
                t->next = h->tags.head;
                t = mandoc_malloc(sizeof(struct tag));
                t->tag = tag;
                t->next = h->tags.head;
@@ -470,16 +470,19 @@ print_otag(struct html *h, enum htmltag tag,
        } else
                t = NULL;
 
        } else
                t = NULL;
 
-       if ( ! (HTML_NOSPACE & h->flags))
-               if ( ! (HTML_CLRLINE & htmltags[tag].flags)) {
-                       /* Manage keeps! */
-                       if ( ! (HTML_KEEP & h->flags)) {
-                               if (HTML_PREKEEP & h->flags)
-                                       h->flags |= HTML_KEEP;
-                               putchar(' ');
-                       } else
-                               printf("&#160;");
+       if (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, "&#160;");
+               else {
+                       if (h->flags & HTML_PREKEEP)
+                               h->flags |= HTML_KEEP;
+                       print_endword(h);
                }
                }
+       }
 
        if ( ! (h->flags & HTML_NONOSPACE))
                h->flags &= ~HTML_NOSPACE;
 
        if ( ! (h->flags & HTML_NONOSPACE))
                h->flags &= ~HTML_NOSPACE;
@@ -488,85 +491,245 @@ print_otag(struct html *h, enum htmltag tag,
 
        /* Print out the tag name and attributes. */
 
 
        /* 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);
+       print_byte(h, '<');
+       print_word(h, htmltags[tag].name);
 
 
-       /* Accommodate for XML "well-formed" singleton escaping. */
+       va_start(ap, fmt);
 
 
-       if (HTML_AUTOCLOSE & htmltags[tag].flags)
-               switch (h->type) {
-               case HTML_XHTML_1_0_STRICT:
-                       putchar('/');
+       have_style = 0;
+       while (*fmt != '\0') {
+               if (*fmt == 's') {
+                       print_word(h, " style=\"");
+                       have_style = 1;
+                       fmt++;
+                       break;
+               }
+               s = va_arg(ap, char *);
+               switch (*fmt++) {
+               case 'c':
+                       attr = "class";
+                       break;
+               case 'h':
+                       attr = "href";
+                       break;
+               case 'i':
+                       attr = "id";
+                       break;
+               case '?':
+                       attr = s;
+                       s = va_arg(ap, char *);
                        break;
                default:
                        break;
                default:
+                       abort();
+               }
+               print_byte(h, ' ');
+               print_word(h, attr);
+               print_byte(h, '=');
+               print_byte(h, '"');
+               switch (*fmt) {
+               case 'M':
+                       print_href(h, s, va_arg(ap, char *), 1);
+                       fmt++;
+                       break;
+               case 'I':
+                       print_href(h, s, NULL, 0);
+                       fmt++;
+                       break;
+               case 'R':
+                       print_byte(h, '#');
+                       fmt++;
+                       /* FALLTHROUGH */
+               default:
+                       print_encode(h, s, NULL, 1);
                        break;
                }
                        break;
                }
+               print_byte(h, '"');
+       }
 
 
-       putchar('>');
+       /* Print out styles. */
 
 
-       h->flags |= HTML_NOSPACE;
+       s = NULL;
+       su = &mysu;
+       while (*fmt != '\0') {
 
 
-       if ((HTML_AUTOCLOSE | HTML_CLRLINE) & htmltags[tag].flags)
-               putchar('\n');
+               /* First letter: input argument type. */
+
+               switch (*fmt++) {
+               case 'h':
+                       i = va_arg(ap, int);
+                       SCALE_HS_INIT(su, i);
+                       break;
+               case 's':
+                       s = va_arg(ap, char *);
+                       break;
+               case 'u':
+                       su = va_arg(ap, struct roffsu *);
+                       break;
+               case 'v':
+                       i = va_arg(ap, int);
+                       SCALE_VS_INIT(su, i);
+                       break;
+               case 'w':
+                       s = va_arg(ap, char *);
+                       a2width(s, su);
+                       break;
+               default:
+                       abort();
+               }
+
+               /* Second letter: style name. */
+
+               switch (*fmt++) {
+               case 'b':
+                       attr = "margin-bottom";
+                       break;
+               case 'h':
+                       attr = "height";
+                       break;
+               case 'i':
+                       attr = "text-indent";
+                       break;
+               case 'l':
+                       attr = "margin-left";
+                       break;
+               case 't':
+                       attr = "margin-top";
+                       break;
+               case 'w':
+                       attr = "width";
+                       break;
+               case 'W':
+                       attr = "min-width";
+                       break;
+               case '?':
+                       print_word(h, s);
+                       print_byte(h, ':');
+                       print_byte(h, ' ');
+                       print_word(h, va_arg(ap, char *));
+                       print_byte(h, ';');
+                       if (*fmt != '\0')
+                               print_byte(h, ' ');
+                       continue;
+               default:
+                       abort();
+               }
+               v = su->scale;
+               if (su->unit == SCALE_MM && (v /= 100.0) == 0.0)
+                       v = 1.0;
+               else if (su->unit == SCALE_BU)
+                       v /= 24.0;
+               print_word(h, attr);
+               print_byte(h, ':');
+               print_byte(h, ' ');
+               (void)snprintf(numbuf, sizeof(numbuf), "%.2f", v);
+               print_word(h, numbuf);
+               print_word(h, roffscales[su->unit]);
+               print_byte(h, ';');
+               if (*fmt != '\0')
+                       print_byte(h, ' ');
+       }
+       if (have_style)
+               print_byte(h, '"');
 
 
-       return(t);
+       va_end(ap);
+
+       /* Accommodate for "well-formed" singleton escaping. */
+
+       if (HTML_AUTOCLOSE & htmltags[tag].flags)
+               print_byte(h, '/');
+
+       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
 }
 
 static void
-print_ctag(struct html *h, enum htmltag tag)
+print_ctag(struct html *h, struct tag *tag)
 {
 {
+       int      tflags;
 
 
-       printf("</%s>", htmltags[tag].name);
-       if (HTML_CLRLINE & htmltags[tag].flags) {
-               h->flags |= HTML_NOSPACE;
-               putchar('\n');
-       }
+       /*
+        * 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;
+
+       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);
+
+       h->tags.head = tag->next;
+       free(tag);
 }
 
 void
 print_gen_decls(struct html *h)
 {
 }
 
 void
 print_gen_decls(struct html *h)
 {
-
-       puts("<!DOCTYPE html>");
+       print_word(h, "<!DOCTYPE html>");
+       print_endline(h);
 }
 
 void
 print_text(struct html *h, const char *word)
 {
 }
 
 void
 print_text(struct html *h, const char *word)
 {
-
-       if ( ! (HTML_NOSPACE & h->flags)) {
-               /* Manage keeps! */
+       if (h->col && (h->flags & HTML_NOSPACE) == 0) {
                if ( ! (HTML_KEEP & h->flags)) {
                        if (HTML_PREKEEP & h->flags)
                                h->flags |= HTML_KEEP;
                if ( ! (HTML_KEEP & h->flags)) {
                        if (HTML_PREKEEP & h->flags)
                                h->flags |= HTML_KEEP;
-                       putchar(' ');
+                       print_endword(h);
                } else
                } else
-                       printf("&#160;");
+                       print_word(h, "&#160;");
        }
 
        assert(NULL == h->metaf);
        switch (h->metac) {
        case HTMLFONT_ITALIC:
        }
 
        assert(NULL == h->metaf);
        switch (h->metac) {
        case HTMLFONT_ITALIC:
-               h->metaf = print_otag(h, TAG_I, 0, NULL);
+               h->metaf = print_otag(h, TAG_I, "");
                break;
        case HTMLFONT_BOLD:
                break;
        case HTMLFONT_BOLD:
-               h->metaf = print_otag(h, TAG_B, 0, NULL);
+               h->metaf = print_otag(h, TAG_B, "");
                break;
        case HTMLFONT_BI:
                break;
        case HTMLFONT_BI:
-               h->metaf = print_otag(h, TAG_B, 0, NULL);
-               print_otag(h, TAG_I, 0, NULL);
+               h->metaf = print_otag(h, TAG_B, "");
+               print_otag(h, TAG_I, "");
                break;
        default:
                break;
        default:
+               print_indent(h);
                break;
        }
 
        assert(word);
                break;
        }
 
        assert(word);
-       if ( ! print_encode(h, word, 0)) {
+       if ( ! print_encode(h, word, NULL, 0)) {
                if ( ! (h->flags & HTML_NONOSPACE))
                        h->flags &= ~HTML_NOSPACE;
                if ( ! (h->flags & HTML_NONOSPACE))
                        h->flags &= ~HTML_NOSPACE;
+               h->flags &= ~HTML_NONEWLINE;
        } else
        } else
-               h->flags |= HTML_NOSPACE;
+               h->flags |= HTML_NOSPACE | HTML_NONEWLINE;
 
        if (h->metaf) {
                print_tagq(h, h->metaf);
 
        if (h->metaf) {
                print_tagq(h, h->metaf);
@@ -582,17 +745,7 @@ 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);
                if (until && tag == until)
                        return;
        }
                if (until && tag == until)
                        return;
        }
@@ -606,144 +759,144 @@ 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);
        }
 }
 
 void
        }
 }
 
 void
-bufinit(struct html *h)
+print_paragraph(struct html *h)
 {
 {
+       struct tag      *t;
 
 
-       h->buf[0] = '\0';
-       h->buflen = 0;
+       t = print_otag(h, TAG_DIV, "c", "Pp");
+       print_tagq(h, t);
 }
 
 }
 
-void
-bufcat_style(struct html *h, const char *key, const char *val)
-{
 
 
-       bufcat(h, key);
-       bufcat(h, ":");
-       bufcat(h, val);
-       bufcat(h, ";");
-}
+/***********************************************************************
+ * Low level output functions.
+ * They implement line breaking using a short static buffer.
+ ***********************************************************************/
 
 
-void
-bufcat(struct html *h, const char *p)
+/*
+ * 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;
+       }
 
 
-       /*
-        * XXX This is broken and not easy to fix.
-        * When using the -Oincludes option, buffmt_includes()
-        * may pass in strings overrunning BUFSIZ, causing a crash.
-        */
+       if (h->col + h->bufcol < sizeof(h->buf)) {
+               h->buf[h->bufcol++] = c;
+               return;
+       }
 
 
-       h->buflen = strlcat(h->buf, p, BUFSIZ);
-       assert(h->buflen < BUFSIZ);
-}
-
-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);
+       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().
+ */
 static void
 static void
-bufncat(struct html *h, const char *p, size_t sz)
+print_endline(struct html *h)
 {
 {
+       if (h->col == 0)
+               return;
 
 
-       assert(h->buflen + sz + 1 < BUFSIZ);
-       strncat(h->buf, p, sz);
-       h->buflen += 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;
 }
 
 }
 
-void
-buffmt_includes(struct html *h, const char *name)
+/*
+ * Flush the HTML output buffer.
+ * If it is inactive, activate it.
+ */
+static void
+print_endword(struct html *h)
 {
 {
-       const char      *p, *pp;
-
-       pp = h->base_includes;
+       if (h->noindent) {
+               print_byte(h, ' ');
+               return;
+       }
 
 
-       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 ((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;
        }
        }
-       if (pp)
-               bufcat(h, pp);
+       h->bufcol = 0;
 }
 
 }
 
-void
-buffmt_man(struct html *h, const char *name, const char *sec)
+/*
+ * 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)
 {
 {
-       const char      *p, *pp;
+       size_t   i;
 
 
-       pp = h->base_man;
+       if (h->col)
+               return;
 
 
-       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, "%s", name);
-                       break;
-               default:
-                       bufncat(h, p, 2);
-                       break;
-               }
-               pp = p + 2;
+       if (h->noindent == 0) {
+               h->col = h->indent * 2;
+               for (i = 0; i < h->col; i++)
+                       putchar(' ');
        }
        }
-       if (pp)
-               bufcat(h, pp);
+       h->flags &= ~HTML_NOSPACE;
 }
 
 }
 
-void
-bufcat_su(struct html *h, const char *p, const struct roffsu *su)
+/*
+ * Print or buffer some characters
+ * depending on the current HTML output buffer state.
+ */
+static void
+print_word(struct html *h, const char *cp)
 {
 {
-       double           v;
-
-       v = su->scale;
-       if (SCALE_MM == su->unit && 0.0 == (v /= 100.0))
-               v = 1.0;
-       else if (SCALE_BU == su->unit)
-               v /= 24.0;
-
-       bufcat_fmt(h, "%s: %.2f%s;", p, v, roffscales[su->unit]);
+       while (*cp != '\0')
+               print_byte(h, *cp++);
 }
 
 }
 
-void
-bufcat_id(struct html *h, const char *src)
+/*
+ * Calculate the scaling unit passed in a `-width' argument.  This uses
+ * either a native scaling unit (e.g., 1i, 2m) or the string length of
+ * the value.
+ */
+static void
+a2width(const char *p, struct roffsu *su)
 {
 {
-
-       /* Cf. <http://www.w3.org/TR/html4/types.html#h-6.2>. */
-
-       while ('\0' != *src)
-               bufcat_fmt(h, "%.2x", *src++);
+       if (a2roffsu(p, su, SCALE_MAX) < 2) {
+               su->unit = SCALE_EN;
+               su->scale = html_strlen(p);
+       } else if (su->scale < 0.0)
+               su->scale = 0.0;
 }
 }
A git conversion mirror of mandoc.bsd.lv