]> 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
isspace(3) requires an unsigned argument;
[mandoc.git] / html.c
diff --git a/html.c b/html.c
index c3ab3b47c579d55366933ccb11293edcba3d7118..71c9c711e825851b2b52bec5a6d58d5904dcde11 100644 (file)
--- a/html.c
+++ b/html.c
@@ -1,7 +1,7 @@
-/*     $Id: html.c,v 1.203 2017/01/28 22:36:38 schwarze Exp $ */
+/* $Id: html.c,v 1.275 2021/09/09 14:47:24 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011-2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011-2015, 2017-2021 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,22 +14,29 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Common functions for mandoc(1) HTML formatters.
+ * For use by individual formatters and by the main program.
  */
 #include "config.h"
 
 #include <sys/types.h>
  */
 #include "config.h"
 
 #include <sys/types.h>
+#include <sys/stat.h>
 
 #include <assert.h>
 #include <ctype.h>
 #include <stdarg.h>
 
 #include <assert.h>
 #include <ctype.h>
 #include <stdarg.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-#include "mandoc.h"
 #include "mandoc_aux.h"
 #include "mandoc_aux.h"
+#include "mandoc_ohash.h"
+#include "mandoc.h"
+#include "roff.h"
 #include "out.h"
 #include "html.h"
 #include "manconf.h"
 #include "out.h"
 #include "html.h"
 #include "manconf.h"
@@ -38,35 +45,31 @@
 struct htmldata {
        const char       *name;
        int               flags;
 struct htmldata {
        const char       *name;
        int               flags;
-#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_INPHRASE    (1 << 0)  /* Can appear in phrasing context. */
+#define        HTML_TOPHRASE    (1 << 1)  /* Establishes phrasing context. */
+#define        HTML_NOSTACK     (1 << 2)  /* Does not have an end tag. */
+#define        HTML_NLBEFORE    (1 << 3)  /* Output line break before opening. */
+#define        HTML_NLBEGIN     (1 << 4)  /* Output line break after opening. */
+#define        HTML_NLEND       (1 << 5)  /* Output line break before closing. */
+#define        HTML_NLAFTER     (1 << 6)  /* Output line break after closing. */
 #define        HTML_NLAROUND    (HTML_NLBEFORE | HTML_NLAFTER)
 #define        HTML_NLINSIDE    (HTML_NLBEGIN | HTML_NLEND)
 #define        HTML_NLALL       (HTML_NLAROUND | HTML_NLINSIDE)
 #define        HTML_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)
+#define        HTML_INDENT      (1 << 7)  /* Indent content by two spaces. */
+#define        HTML_NOINDENT    (1 << 8)  /* Exception: never indent content. */
 };
 
 static const struct htmldata htmltags[TAG_MAX] = {
        {"html",        HTML_NLALL},
        {"head",        HTML_NLALL | HTML_INDENT},
 };
 
 static const struct htmldata htmltags[TAG_MAX] = {
        {"html",        HTML_NLALL},
        {"head",        HTML_NLALL | HTML_INDENT},
-       {"body",        HTML_NLALL},
-       {"meta",        HTML_NOSTACK | HTML_AUTOCLOSE | HTML_NLALL},
+       {"meta",        HTML_NOSTACK | HTML_NLALL},
+       {"link",        HTML_NOSTACK | HTML_NLALL},
+       {"style",       HTML_NLALL | HTML_INDENT},
        {"title",       HTML_NLAROUND},
        {"title",       HTML_NLAROUND},
+       {"body",        HTML_NLALL},
        {"div",         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},
+       {"section",     HTML_NLALL},
        {"table",       HTML_NLALL | HTML_INDENT},
        {"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},
        {"tr",          HTML_NLALL | HTML_INDENT},
        {"td",          HTML_NLAROUND},
        {"li",          HTML_NLAROUND | HTML_INDENT},
@@ -75,15 +78,25 @@ static      const struct htmldata htmltags[TAG_MAX] = {
        {"dl",          HTML_NLALL | HTML_INDENT},
        {"dt",          HTML_NLAROUND},
        {"dd",          HTML_NLAROUND | 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},
+       {"h1",          HTML_TOPHRASE | HTML_NLAROUND},
+       {"h2",          HTML_TOPHRASE | HTML_NLAROUND},
+       {"p",           HTML_TOPHRASE | HTML_NLAROUND | HTML_INDENT},
+       {"pre",         HTML_TOPHRASE | HTML_NLAROUND | HTML_NOINDENT},
+       {"a",           HTML_INPHRASE | HTML_TOPHRASE},
+       {"b",           HTML_INPHRASE | HTML_TOPHRASE},
+       {"cite",        HTML_INPHRASE | HTML_TOPHRASE},
+       {"code",        HTML_INPHRASE | HTML_TOPHRASE},
+       {"i",           HTML_INPHRASE | HTML_TOPHRASE},
+       {"small",       HTML_INPHRASE | HTML_TOPHRASE},
+       {"span",        HTML_INPHRASE | HTML_TOPHRASE},
+       {"var",         HTML_INPHRASE | HTML_TOPHRASE},
+       {"br",          HTML_INPHRASE | HTML_NOSTACK | HTML_NLALL},
+       {"hr",          HTML_INPHRASE | HTML_NOSTACK},
+       {"mark",        HTML_INPHRASE },
+       {"math",        HTML_INPHRASE | HTML_NLALL | HTML_INDENT},
        {"mrow",        0},
        {"mi",          0},
        {"mrow",        0},
        {"mi",          0},
+       {"mn",          0},
        {"mo",          0},
        {"msup",        0},
        {"msub",        0},
        {"mo",          0},
        {"msup",        0},
        {"msub",        0},
@@ -99,20 +112,15 @@ static     const struct htmldata htmltags[TAG_MAX] = {
        {"mover",       0},
 };
 
        {"mover",       0},
 };
 
-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 */
+/* Avoid duplicate HTML id= attributes. */
+
+struct id_entry {
+       int      ord;   /* Ordinal number of the latest occurrence. */
+       char     id[];  /* The id= attribute without any ordinal suffix. */
 };
 };
+static struct ohash     id_unique;
 
 
-static void     a2width(const char *, struct roffsu *);
+static void     html_reset_internal(struct html *);
 static void     print_byte(struct html *, char);
 static void     print_endword(struct html *);
 static void     print_indent(struct html *);
 static void     print_byte(struct html *, char);
 static void     print_endword(struct html *);
 static void     print_indent(struct html *);
@@ -122,7 +130,7 @@ 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 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 *);
 
 
 void *
 
 
 void *
@@ -132,30 +140,55 @@ html_alloc(const struct manoutput *outopts)
 
        h = mandoc_calloc(1, sizeof(struct html));
 
 
        h = mandoc_calloc(1, sizeof(struct html));
 
-       h->tags.head = NULL;
+       h->tag = NULL;
+       h->metac = h->metal = ESCAPE_FONTROMAN;
        h->style = outopts->style;
        h->style = outopts->style;
-       h->base_man = outopts->man;
+       if ((h->base_man1 = outopts->man) == NULL)
+               h->base_man2 = NULL;
+       else if ((h->base_man2 = strchr(h->base_man1, ';')) != NULL)
+               *h->base_man2++ = '\0';
        h->base_includes = outopts->includes;
        if (outopts->fragment)
                h->oflags |= HTML_FRAGMENT;
        h->base_includes = outopts->includes;
        if (outopts->fragment)
                h->oflags |= HTML_FRAGMENT;
+       if (outopts->toc)
+               h->oflags |= HTML_TOC;
+
+       mandoc_ohash_init(&id_unique, 4, offsetof(struct id_entry, id));
 
        return h;
 }
 
 
        return h;
 }
 
-void
-html_free(void *p)
+static void
+html_reset_internal(struct html *h)
 {
        struct tag      *tag;
 {
        struct tag      *tag;
-       struct html     *h;
-
-       h = (struct html *)p;
+       struct id_entry *entry;
+       unsigned int     slot;
 
 
-       while ((tag = h->tags.head) != NULL) {
-               h->tags.head = tag->next;
+       while ((tag = h->tag) != NULL) {
+               h->tag = tag->next;
                free(tag);
        }
                free(tag);
        }
+       entry = ohash_first(&id_unique, &slot);
+       while (entry != NULL) {
+               free(entry);
+               entry = ohash_next(&id_unique, &slot);
+       }
+       ohash_delete(&id_unique);
+}
 
 
-       free(h);
+void
+html_reset(void *p)
+{
+       html_reset_internal(p);
+       mandoc_ohash_init(&id_unique, 4, offsetof(struct id_entry, id));
+}
+
+void
+html_free(void *p)
+{
+       html_reset_internal(p);
+       free(p);
 }
 
 void
 }
 
 void
@@ -164,9 +197,16 @@ print_gen_head(struct html *h)
        struct tag      *t;
 
        print_otag(h, TAG_META, "?", "charset", "utf-8");
        struct tag      *t;
 
        print_otag(h, TAG_META, "?", "charset", "utf-8");
+       print_otag(h, TAG_META, "??", "name", "viewport",
+           "content", "width=device-width, initial-scale=1.0");
+       if (h->style != NULL) {
+               print_otag(h, TAG_LINK, "?h??", "rel", "stylesheet",
+                   h->style, "type", "text/css", "media", "all");
+               return;
+       }
 
        /*
 
        /*
-        * Print a default style-sheet.
+        * Print a minimal embedded style sheet.
         */
 
        t = print_otag(h, TAG_STYLE, "");
         */
 
        t = print_otag(h, TAG_STYLE, "");
@@ -176,113 +216,216 @@ print_gen_head(struct html *h)
        print_endline(h);
        print_text(h, "td.head-vol { text-align: center; }");
        print_endline(h);
        print_endline(h);
        print_text(h, "td.head-vol { text-align: center; }");
        print_endline(h);
-       print_text(h, "div.Pp { margin: 1ex 0ex; }");
+       print_text(h, ".Nd, .Bf, .Op { display: inline; }");
+       print_endline(h);
+       print_text(h, ".Pa, .Ad { font-style: italic; }");
+       print_endline(h);
+       print_text(h, ".Ms { font-weight: bold; }");
+       print_endline(h);
+       print_text(h, ".Bl-diag ");
+       print_byte(h, '>');
+       print_text(h, " dt { font-weight: bold; }");
+       print_endline(h);
+       print_text(h, "code.Nm, .Fl, .Cm, .Ic, code.In, .Fd, .Fn, .Cd "
+           "{ font-weight: bold; font-family: inherit; }");
        print_tagq(h, t);
        print_tagq(h, t);
-
-       if (h->style)
-               print_otag(h, TAG_LINK, "?h??", "rel", "stylesheet",
-                   h->style, "type", "text/css", "media", "all");
 }
 
 }
 
-static void
-print_metaf(struct html *h, enum mandoc_esc deco)
+int
+html_setfont(struct html *h, enum mandoc_esc font)
 {
 {
-       enum htmlfont    font;
-
-       switch (deco) {
+       switch (font) {
        case ESCAPE_FONTPREV:
                font = h->metal;
                break;
        case ESCAPE_FONTITALIC:
        case ESCAPE_FONTPREV:
                font = h->metal;
                break;
        case ESCAPE_FONTITALIC:
-               font = HTMLFONT_ITALIC;
-               break;
        case ESCAPE_FONTBOLD:
        case ESCAPE_FONTBOLD:
-               font = HTMLFONT_BOLD;
-               break;
        case ESCAPE_FONTBI:
        case ESCAPE_FONTBI:
-               font = HTMLFONT_BI;
+       case ESCAPE_FONTROMAN:
+       case ESCAPE_FONTCR:
+       case ESCAPE_FONTCB:
+       case ESCAPE_FONTCI:
                break;
        case ESCAPE_FONT:
                break;
        case ESCAPE_FONT:
-       case ESCAPE_FONTROMAN:
-               font = HTMLFONT_NONE;
+               font = ESCAPE_FONTROMAN;
                break;
        default:
                break;
        default:
-               abort();
+               return 0;
        }
        }
+       h->metal = h->metac;
+       h->metac = font;
+       return 1;
+}
 
 
+static void
+print_metaf(struct html *h)
+{
        if (h->metaf) {
                print_tagq(h, h->metaf);
                h->metaf = NULL;
        }
        if (h->metaf) {
                print_tagq(h, h->metaf);
                h->metaf = NULL;
        }
-
-       h->metal = h->metac;
-       h->metac = font;
-
-       switch (font) {
-       case HTMLFONT_ITALIC:
+       switch (h->metac) {
+       case ESCAPE_FONTITALIC:
                h->metaf = print_otag(h, TAG_I, "");
                break;
                h->metaf = print_otag(h, TAG_I, "");
                break;
-       case HTMLFONT_BOLD:
+       case ESCAPE_FONTBOLD:
                h->metaf = print_otag(h, TAG_B, "");
                break;
                h->metaf = print_otag(h, TAG_B, "");
                break;
-       case HTMLFONT_BI:
+       case ESCAPE_FONTBI:
                h->metaf = print_otag(h, TAG_B, "");
                print_otag(h, TAG_I, "");
                break;
                h->metaf = print_otag(h, TAG_B, "");
                print_otag(h, TAG_I, "");
                break;
+       case ESCAPE_FONTCR:
+               h->metaf = print_otag(h, TAG_SPAN, "c", "Li");
+               break;
+       case ESCAPE_FONTCB:
+               h->metaf = print_otag(h, TAG_SPAN, "c", "Li");
+               print_otag(h, TAG_B, "");
+               break;
+       case ESCAPE_FONTCI:
+               h->metaf = print_otag(h, TAG_SPAN, "c", "Li");
+               print_otag(h, TAG_I, "");
+               break;
        default:
                break;
        }
 }
 
        default:
                break;
        }
 }
 
-int
-html_strlen(const char *cp)
+void
+html_close_paragraph(struct html *h)
 {
 {
-       size_t           rsz;
-       int              skip, sz;
+       struct tag      *this, *next;
+       int              flags;
+
+       this = h->tag;
+       for (;;) {
+               next = this->next;
+               flags = htmltags[this->tag].flags;
+               if (flags & (HTML_INPHRASE | HTML_TOPHRASE))
+                       print_ctag(h, this);
+               if ((flags & HTML_INPHRASE) == 0)
+                       break;
+               this = next;
+       }
+}
 
 
-       /*
-        * 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.
-        */
+/*
+ * ROFF_nf switches to no-fill mode, ROFF_fi to fill mode.
+ * TOKEN_NONE does not switch.  The old mode is returned.
+ */
+enum roff_tok
+html_fillmode(struct html *h, enum roff_tok want)
+{
+       struct tag      *t;
+       enum roff_tok    had;
 
 
-       sz = 0;
-       skip = 0;
-       while (1) {
-               rsz = strcspn(cp, "\\");
-               if (rsz) {
-                       cp += rsz;
-                       if (skip) {
-                               skip = 0;
-                               rsz--;
-                       }
-                       sz += rsz;
-               }
-               if ('\0' == *cp)
+       for (t = h->tag; t != NULL; t = t->next)
+               if (t->tag == TAG_PRE)
                        break;
                        break;
-               cp++;
-               switch (mandoc_escape(&cp, NULL, NULL)) {
-               case ESCAPE_ERROR:
-                       return sz;
-               case ESCAPE_UNICODE:
-               case ESCAPE_NUMBERED:
-               case ESCAPE_SPECIAL:
-               case ESCAPE_OVERSTRIKE:
-                       if (skip)
-                               skip = 0;
-                       else
-                               sz++;
+
+       had = t == NULL ? ROFF_fi : ROFF_nf;
+
+       if (want != had) {
+               switch (want) {
+               case ROFF_fi:
+                       print_tagq(h, t);
                        break;
                        break;
-               case ESCAPE_SKIPCHAR:
-                       skip = 1;
+               case ROFF_nf:
+                       html_close_paragraph(h);
+                       print_otag(h, TAG_PRE, "");
+                       break;
+               case TOKEN_NONE:
                        break;
                default:
                        break;
                default:
+                       abort();
+               }
+       }
+       return had;
+}
+
+/*
+ * Allocate a string to be used for the "id=" attribute of an HTML
+ * element and/or as a segment identifier for a URI in an <a> element.
+ * The function may fail and return NULL if the node lacks text data
+ * to create the attribute from.
+ * The caller is responsible for free(3)ing the returned string.
+ *
+ * If the "unique" argument is non-zero, the "id_unique" ohash table
+ * is used for de-duplication.  If the "unique" argument is 1,
+ * it is the first time the function is called for this tag and
+ * location, so if an ordinal suffix is needed, it is incremented.
+ * If the "unique" argument is 2, it is the second time the function
+ * is called for this tag and location, so the ordinal suffix
+ * remains unchanged.
+ */
+char *
+html_make_id(const struct roff_node *n, int unique)
+{
+       const struct roff_node  *nch;
+       struct id_entry         *entry;
+       char                    *buf, *cp;
+       size_t                   len;
+       unsigned int             slot;
+
+       if (n->tag != NULL)
+               buf = mandoc_strdup(n->tag);
+       else {
+               switch (n->tok) {
+               case MDOC_Sh:
+               case MDOC_Ss:
+               case MDOC_Sx:
+               case MAN_SH:
+               case MAN_SS:
+                       for (nch = n->child; nch != NULL; nch = nch->next)
+                               if (nch->type != ROFFT_TEXT)
+                                       return NULL;
+                       buf = NULL;
+                       deroff(&buf, n);
+                       if (buf == NULL)
+                               return NULL;
+                       break;
+               default:
+                       if (n->child == NULL || n->child->type != ROFFT_TEXT)
+                               return NULL;
+                       buf = mandoc_strdup(n->child->string);
                        break;
                }
        }
                        break;
                }
        }
-       return sz;
+
+       /*
+        * In ID attributes, only use ASCII characters that are
+        * permitted in URL-fragment strings according to the
+        * explicit list at:
+        * https://url.spec.whatwg.org/#url-fragment-string
+        * In addition, reserve '~' for ordinal suffixes.
+        */
+
+       for (cp = buf; *cp != '\0'; cp++)
+               if (isalnum((unsigned char)*cp) == 0 &&
+                   strchr("!$&'()*+,-./:;=?@_", *cp) == NULL)
+                       *cp = '_';
+
+       if (unique == 0)
+               return buf;
+
+       /* Avoid duplicate HTML id= attributes. */
+
+       slot = ohash_qlookup(&id_unique, buf);
+       if ((entry = ohash_find(&id_unique, slot)) == NULL) {
+               len = strlen(buf) + 1;
+               entry = mandoc_malloc(sizeof(*entry) + len);
+               entry->ord = 1;
+               memcpy(entry->id, buf, len);
+               ohash_insert(&id_unique, slot, entry);
+       } else if (unique == 1)
+               entry->ord++;
+
+       if (entry->ord > 1) {
+               cp = buf;
+               mandoc_asprintf(&buf, "%s~%d", cp, entry->ord);
+               free(cp);
+       }
+       return buf;
 }
 
 static int
 }
 
 static int
@@ -320,16 +463,17 @@ static int
 print_encode(struct html *h, const char *p, const char *pend, int norecurse)
 {
        char             numbuf[16];
 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;
        const char      *seq;
+       size_t           sz;
+       int              c, len, breakline, nospace;
        enum mandoc_esc  esc;
        enum mandoc_esc  esc;
-       static const char rejs[9] = { '\\', '<', '>', '&', '"',
+       static const char rejs[10] = { ' ', '\\', '<', '>', '&', '"',
                ASCII_NBRSP, ASCII_HYPH, ASCII_BREAK, '\0' };
 
        if (pend == NULL)
                pend = strchr(p, '\0');
 
                ASCII_NBRSP, ASCII_HYPH, ASCII_BREAK, '\0' };
 
        if (pend == NULL)
                pend = strchr(p, '\0');
 
+       breakline = 0;
        nospace = 0;
 
        while (p < pend) {
        nospace = 0;
 
        while (p < pend) {
@@ -340,21 +484,30 @@ print_encode(struct html *h, const char *p, const char *pend, int norecurse)
                }
 
                for (sz = strcspn(p, rejs); sz-- && p < pend; p++)
                }
 
                for (sz = strcspn(p, rejs); sz-- && p < pend; p++)
-                       if (*p == ' ')
-                               print_endword(h);
-                       else
-                               print_byte(h, *p);
+                       print_byte(h, *p);
+
+               if (breakline &&
+                   (p >= pend || *p == ' ' || *p == ASCII_NBRSP)) {
+                       print_otag(h, TAG_BR, "");
+                       breakline = 0;
+                       while (p < pend && (*p == ' ' || *p == ASCII_NBRSP))
+                               p++;
+                       continue;
+               }
 
                if (p >= pend)
                        break;
 
 
                if (p >= pend)
                        break;
 
+               if (*p == ' ') {
+                       print_endword(h);
+                       p++;
+                       continue;
+               }
+
                if (print_escape(h, *p++))
                        continue;
 
                esc = mandoc_escape(&p, &seq, &len);
                if (print_escape(h, *p++))
                        continue;
 
                esc = mandoc_escape(&p, &seq, &len);
-               if (ESCAPE_ERROR == esc)
-                       break;
-
                switch (esc) {
                case ESCAPE_FONT:
                case ESCAPE_FONTPREV:
                switch (esc) {
                case ESCAPE_FONT:
                case ESCAPE_FONTPREV:
@@ -362,12 +515,21 @@ print_encode(struct html *h, const char *p, const char *pend, int norecurse)
                case ESCAPE_FONTITALIC:
                case ESCAPE_FONTBI:
                case ESCAPE_FONTROMAN:
                case ESCAPE_FONTITALIC:
                case ESCAPE_FONTBI:
                case ESCAPE_FONTROMAN:
-                       if (0 == norecurse)
-                               print_metaf(h, esc);
+               case ESCAPE_FONTCR:
+               case ESCAPE_FONTCB:
+               case ESCAPE_FONTCI:
+                       if (0 == norecurse) {
+                               h->flags |= HTML_NOSPACE;
+                               if (html_setfont(h, esc))
+                                       print_metaf(h);
+                               h->flags &= ~HTML_NOSPACE;
+                       }
                        continue;
                case ESCAPE_SKIPCHAR:
                        h->flags |= HTML_SKIPCHAR;
                        continue;
                        continue;
                case ESCAPE_SKIPCHAR:
                        h->flags |= HTML_SKIPCHAR;
                        continue;
+               case ESCAPE_ERROR:
+                       continue;
                default:
                        break;
                }
                default:
                        break;
                }
@@ -392,6 +554,15 @@ print_encode(struct html *h, const char *p, const char *pend, int norecurse)
                        if (c <= 0)
                                continue;
                        break;
                        if (c <= 0)
                                continue;
                        break;
+               case ESCAPE_UNDEF:
+                       c = *seq;
+                       break;
+               case ESCAPE_DEVICE:
+                       print_word(h, "html");
+                       continue;
+               case ESCAPE_BREAK:
+                       breakline = 1;
+                       continue;
                case ESCAPE_NOSPACE:
                        if ('\0' == *p)
                                nospace = 1;
                case ESCAPE_NOSPACE:
                        if ('\0' == *p)
                                nospace = 1;
@@ -408,7 +579,7 @@ print_encode(struct html *h, const char *p, const char *pend, int norecurse)
                    (c > 0x7E && c < 0xA0))
                        c = 0xFFFD;
                if (c > 0x7E) {
                    (c > 0x7E && c < 0xA0))
                        c = 0xFFFD;
                if (c > 0x7E) {
-                       (void)snprintf(numbuf, sizeof(numbuf), "&#%d;", c);
+                       (void)snprintf(numbuf, sizeof(numbuf), "&#x%.4X;", c);
                        print_word(h, numbuf);
                } else if (print_escape(h, c) == 0)
                        print_byte(h, c);
                        print_word(h, numbuf);
                } else if (print_escape(h, c) == 0)
                        print_byte(h, c);
@@ -420,9 +591,21 @@ print_encode(struct html *h, const char *p, const char *pend, int norecurse)
 static void
 print_href(struct html *h, const char *name, const char *sec, int man)
 {
 static void
 print_href(struct html *h, const char *name, const char *sec, int man)
 {
+       struct stat      sb;
        const char      *p, *pp;
        const char      *p, *pp;
+       char            *filename;
+
+       if (man) {
+               pp = h->base_man1;
+               if (h->base_man2 != NULL) {
+                       mandoc_asprintf(&filename, "%s.%s", name, sec);
+                       if (stat(filename, &sb) == -1)
+                               pp = h->base_man2;
+                       free(filename);
+               }
+       } else
+               pp = h->base_includes;
 
 
-       pp = man ? h->base_man : h->base_includes;
        while ((p = strchr(pp, '%')) != NULL) {
                print_encode(h, pp, p, 1);
                if (man && p[1] == 'S') {
        while ((p = strchr(pp, '%')) != NULL) {
                print_encode(h, pp, p, 1);
                if (man && p[1] == 'S') {
@@ -445,23 +628,41 @@ struct tag *
 print_otag(struct html *h, enum htmltag tag, const char *fmt, ...)
 {
        va_list          ap;
 print_otag(struct html *h, enum htmltag tag, const char *fmt, ...)
 {
        va_list          ap;
-       struct roffsu    mysu, *su;
-       char             numbuf[16];
        struct tag      *t;
        const char      *attr;
        char            *arg1, *arg2;
        struct tag      *t;
        const char      *attr;
        char            *arg1, *arg2;
-       double           v;
-       int              i, have_style, tflags;
+       int              style_written, tflags;
 
        tflags = htmltags[tag].flags;
 
 
        tflags = htmltags[tag].flags;
 
-       /* Push this tags onto the stack of open scopes. */
+       /* Flow content is not allowed in phrasing context. */
+
+       if ((tflags & HTML_INPHRASE) == 0) {
+               for (t = h->tag; t != NULL; t = t->next) {
+                       if (t->closed)
+                               continue;
+                       assert((htmltags[t->tag].flags & HTML_TOPHRASE) == 0);
+                       break;
+               }
+
+       /*
+        * Always wrap phrasing elements in a paragraph
+        * unless already contained in some flow container;
+        * never put them directly into a section.
+        */
+
+       } else if (tflags & HTML_TOPHRASE && h->tag->tag == TAG_SECTION)
+               print_otag(h, TAG_P, "c", "Pp");
+
+       /* Push this tag onto the stack of open scopes. */
 
        if ((tflags & HTML_NOSTACK) == 0) {
                t = mandoc_malloc(sizeof(struct tag));
                t->tag = tag;
 
        if ((tflags & HTML_NOSTACK) == 0) {
                t = mandoc_malloc(sizeof(struct tag));
                t->tag = tag;
-               t->next = h->tags.head;
-               h->tags.head = t;
+               t->next = h->tag;
+               t->refcnt = 0;
+               t->closed = 0;
+               h->tag = t;
        } else
                t = NULL;
 
        } else
                t = NULL;
 
@@ -471,7 +672,7 @@ print_otag(struct html *h, enum htmltag tag, const char *fmt, ...)
                print_indent(h);
        else if ((h->flags & HTML_NOSPACE) == 0) {
                if (h->flags & HTML_KEEP)
                print_indent(h);
        else if ((h->flags & HTML_NOSPACE) == 0) {
                if (h->flags & HTML_KEEP)
-                       print_word(h, "&#160;");
+                       print_word(h, "&#x00A0;");
                else {
                        if (h->flags & HTML_PREKEEP)
                                h->flags |= HTML_KEEP;
                else {
                        if (h->flags & HTML_PREKEEP)
                                h->flags |= HTML_KEEP;
@@ -491,17 +692,12 @@ print_otag(struct html *h, enum htmltag tag, const char *fmt, ...)
 
        va_start(ap, fmt);
 
 
        va_start(ap, fmt);
 
-       have_style = 0;
-       while (*fmt != '\0') {
-               if (*fmt == 's') {
-                       have_style = 1;
-                       fmt++;
-                       break;
-               }
+       while (*fmt != '\0' && *fmt != 's') {
 
 
-               /* Parse a non-style attribute and its arguments. */
+               /* Parse attributes and arguments. */
 
                arg1 = va_arg(ap, char *);
 
                arg1 = va_arg(ap, char *);
+               arg2 = NULL;
                switch (*fmt++) {
                case 'c':
                        attr = "class";
                switch (*fmt++) {
                case 'c':
                        attr = "class";
@@ -519,31 +715,31 @@ print_otag(struct html *h, enum htmltag tag, const char *fmt, ...)
                default:
                        abort();
                }
                default:
                        abort();
                }
-               arg2 = NULL;
                if (*fmt == 'M')
                        arg2 = va_arg(ap, char *);
                if (arg1 == NULL)
                        continue;
 
                if (*fmt == 'M')
                        arg2 = va_arg(ap, char *);
                if (arg1 == NULL)
                        continue;
 
-               /* Print the non-style attributes. */
+               /* Print the attributes. */
 
                print_byte(h, ' ');
                print_word(h, attr);
                print_byte(h, '=');
                print_byte(h, '"');
                switch (*fmt) {
 
                print_byte(h, ' ');
                print_word(h, attr);
                print_byte(h, '=');
                print_byte(h, '"');
                switch (*fmt) {
-               case 'M':
-                       print_href(h, arg1, arg2, 1);
-                       fmt++;
-                       break;
                case 'I':
                        print_href(h, arg1, NULL, 0);
                        fmt++;
                        break;
                case 'I':
                        print_href(h, arg1, NULL, 0);
                        fmt++;
                        break;
+               case 'M':
+                       print_href(h, arg1, arg2, 1);
+                       fmt++;
+                       break;
                case 'R':
                        print_byte(h, '#');
                case 'R':
                        print_byte(h, '#');
+                       print_encode(h, arg1, NULL, 1);
                        fmt++;
                        fmt++;
-                       /* FALLTHROUGH */
+                       break;
                default:
                        print_encode(h, arg1, NULL, 1);
                        break;
                default:
                        print_encode(h, arg1, NULL, 1);
                        break;
@@ -551,107 +747,31 @@ print_otag(struct html *h, enum htmltag tag, const char *fmt, ...)
                print_byte(h, '"');
        }
 
                print_byte(h, '"');
        }
 
-       /* Print out styles. */
-
-       while (*fmt != '\0') {
-               arg1 = NULL;
-               su = NULL;
-
-               /* First letter: input argument type. */
-
-               switch (*fmt++) {
-               case 'h':
-                       i = va_arg(ap, int);
-                       su = &mysu;
-                       SCALE_HS_INIT(su, i);
-                       break;
-               case 's':
-                       arg1 = va_arg(ap, char *);
-                       break;
-               case 'u':
-                       su = va_arg(ap, struct roffsu *);
-                       break;
-               case 'v':
-                       i = va_arg(ap, int);
-                       su = &mysu;
-                       SCALE_VS_INIT(su, i);
-                       break;
-               case 'w':
-               case 'W':
-                       if ((arg2 = va_arg(ap, char *)) == NULL)
-                               break;
-                       su = &mysu;
-                       a2width(arg2, su);
-                       if (fmt[-1] == 'W')
-                               su->scale *= -1.0;
-                       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 '?':
-                       attr = arg1;
-                       arg1 = va_arg(ap, char *);
-                       break;
-               default:
-                       abort();
-               }
-               if (su == NULL && arg1 == NULL)
+       style_written = 0;
+       while (*fmt++ == 's') {
+               arg1 = va_arg(ap, char *);
+               arg2 = va_arg(ap, char *);
+               if (arg2 == NULL)
                        continue;
                        continue;
-
-               if (have_style == 1)
-                       print_word(h, " style=\"");
-               else
-                       print_byte(h, ' ');
-               print_word(h, attr);
+               print_byte(h, ' ');
+               if (style_written == 0) {
+                       print_word(h, "style=\"");
+                       style_written = 1;
+               }
+               print_word(h, arg1);
                print_byte(h, ':');
                print_byte(h, ' ');
                print_byte(h, ':');
                print_byte(h, ' ');
-               if (su != NULL) {
-                       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;
-                       (void)snprintf(numbuf, sizeof(numbuf), "%.2f", v);
-                       print_word(h, numbuf);
-                       print_word(h, roffscales[su->unit]);
-               } else
-                       print_word(h, arg1);
+               print_word(h, arg2);
                print_byte(h, ';');
                print_byte(h, ';');
-               have_style = 2;
        }
        }
-       if (have_style == 2)
+       if (style_written)
                print_byte(h, '"');
 
        va_end(ap);
 
        /* Accommodate for "well-formed" singleton escaping. */
 
                print_byte(h, '"');
 
        va_end(ap);
 
        /* Accommodate for "well-formed" singleton escaping. */
 
-       if (HTML_AUTOCLOSE & htmltags[tag].flags)
+       if (htmltags[tag].flags & HTML_NOSTACK)
                print_byte(h, '/');
 
        print_byte(h, '>');
                print_byte(h, '/');
 
        print_byte(h, '>');
@@ -669,38 +789,80 @@ print_otag(struct html *h, enum htmltag tag, const char *fmt, ...)
        return t;
 }
 
        return t;
 }
 
+/*
+ * Print an element with an optional "id=" attribute.
+ * If the element has phrasing content and an "id=" attribute,
+ * also add a permalink: outside if it can be in phrasing context,
+ * inside otherwise.
+ */
+struct tag *
+print_otag_id(struct html *h, enum htmltag elemtype, const char *cattr,
+    struct roff_node *n)
+{
+       struct roff_node *nch;
+       struct tag      *ret, *t;
+       char            *id, *href;
+
+       ret = NULL;
+       id = href = NULL;
+       if (n->flags & NODE_ID)
+               id = html_make_id(n, 1);
+       if (n->flags & NODE_HREF)
+               href = id == NULL ? html_make_id(n, 2) : id;
+       if (href != NULL && htmltags[elemtype].flags & HTML_INPHRASE)
+               ret = print_otag(h, TAG_A, "chR", "permalink", href);
+       t = print_otag(h, elemtype, "ci", cattr, id);
+       if (ret == NULL) {
+               ret = t;
+               if (href != NULL && (nch = n->child) != NULL) {
+                       /* man(7) is safe, it tags phrasing content only. */
+                       if (n->tok > MDOC_MAX ||
+                           htmltags[elemtype].flags & HTML_TOPHRASE)
+                               nch = NULL;
+                       else  /* For mdoc(7), beware of nested blocks. */
+                               while (nch != NULL && nch->type == ROFFT_TEXT)
+                                       nch = nch->next;
+                       if (nch == NULL)
+                               print_otag(h, TAG_A, "chR", "permalink", href);
+               }
+       }
+       free(id);
+       if (id == NULL)
+               free(href);
+       return ret;
+}
+
 static void
 print_ctag(struct html *h, struct tag *tag)
 {
        int      tflags;
 
 static void
 print_ctag(struct html *h, struct tag *tag)
 {
        int      tflags;
 
-       /*
-        * 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);
+       if (tag->closed == 0) {
+               tag->closed = 1;
+               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);
+       }
+       if (tag->refcnt == 0) {
+               h->tag = tag->next;
+               free(tag);
+       }
 }
 
 void
 }
 
 void
@@ -710,36 +872,78 @@ print_gen_decls(struct html *h)
        print_endline(h);
 }
 
        print_endline(h);
 }
 
+void
+print_gen_comment(struct html *h, struct roff_node *n)
+{
+       int      wantblank;
+
+       print_word(h, "<!-- This is an automatically generated file."
+           "  Do not edit.");
+       h->indent = 1;
+       wantblank = 0;
+       while (n != NULL && n->type == ROFFT_COMMENT) {
+               if (strstr(n->string, "-->") == NULL &&
+                   (wantblank || *n->string != '\0')) {
+                       print_endline(h);
+                       print_indent(h);
+                       print_word(h, n->string);
+                       wantblank = *n->string != '\0';
+               }
+               n = n->next;
+       }
+       if (wantblank)
+               print_endline(h);
+       print_word(h, " -->");
+       print_endline(h);
+       h->indent = 0;
+}
+
 void
 print_text(struct html *h, const char *word)
 {
 void
 print_text(struct html *h, const char *word)
 {
+       print_tagged_text(h, word, NULL);
+}
+
+void
+print_tagged_text(struct html *h, const char *word, struct roff_node *n)
+{
+       struct tag      *t;
+       char            *href;
+
+       /*
+        * Always wrap text in a paragraph unless already contained in
+        * some flow container; never put it directly into a section.
+        */
+
+       if (h->tag->tag == TAG_SECTION)
+               print_otag(h, TAG_P, "c", "Pp");
+
+       /* Output whitespace before this text? */
+
        if (h->col && (h->flags & HTML_NOSPACE) == 0) {
                if ( ! (HTML_KEEP & h->flags)) {
                        if (HTML_PREKEEP & h->flags)
                                h->flags |= HTML_KEEP;
                        print_endword(h);
                } else
        if (h->col && (h->flags & HTML_NOSPACE) == 0) {
                if ( ! (HTML_KEEP & h->flags)) {
                        if (HTML_PREKEEP & h->flags)
                                h->flags |= HTML_KEEP;
                        print_endword(h);
                } else
-                       print_word(h, "&#160;");
+                       print_word(h, "&#x00A0;");
        }
 
        }
 
-       assert(NULL == h->metaf);
-       switch (h->metac) {
-       case HTMLFONT_ITALIC:
-               h->metaf = print_otag(h, TAG_I, "");
-               break;
-       case HTMLFONT_BOLD:
-               h->metaf = print_otag(h, TAG_B, "");
-               break;
-       case HTMLFONT_BI:
-               h->metaf = print_otag(h, TAG_B, "");
-               print_otag(h, TAG_I, "");
-               break;
-       default:
-               print_indent(h);
-               break;
-       }
+       /*
+        * Optionally switch fonts, optionally write a permalink, then
+        * print the text, optionally surrounded by HTML whitespace.
+        */
+
+       assert(h->metaf == NULL);
+       print_metaf(h);
+       print_indent(h);
+
+       if (n != NULL && (href = html_make_id(n, 2)) != NULL) {
+               t = print_otag(h, TAG_A, "chR", "permalink", href);
+               free(href);
+       } else
+               t = NULL;
 
 
-       assert(word);
        if ( ! print_encode(h, word, NULL, 0)) {
                if ( ! (h->flags & HTML_NONOSPACE))
                        h->flags &= ~HTML_NOSPACE;
        if ( ! print_encode(h, word, NULL, 0)) {
                if ( ! (h->flags & HTML_NONOSPACE))
                        h->flags &= ~HTML_NOSPACE;
@@ -747,10 +951,11 @@ print_text(struct html *h, const char *word)
        } else
                h->flags |= HTML_NOSPACE | HTML_NONEWLINE;
 
        } else
                h->flags |= HTML_NOSPACE | HTML_NONEWLINE;
 
-       if (h->metaf) {
+       if (h->metaf != NULL) {
                print_tagq(h, h->metaf);
                h->metaf = NULL;
                print_tagq(h, h->metaf);
                h->metaf = NULL;
-       }
+       } else if (t != NULL)
+               print_tagq(h, t);
 
        h->flags &= ~HTML_IGNDELIM;
 }
 
        h->flags &= ~HTML_IGNDELIM;
 }
@@ -758,36 +963,33 @@ print_text(struct html *h, const char *word)
 void
 print_tagq(struct html *h, const struct tag *until)
 {
 void
 print_tagq(struct html *h, const struct tag *until)
 {
-       struct tag      *tag;
+       struct tag      *this, *next;
 
 
-       while ((tag = h->tags.head) != NULL) {
-               print_ctag(h, tag);
-               if (until && tag == until)
-                       return;
+       for (this = h->tag; this != NULL; this = next) {
+               next = this == until ? NULL : this->next;
+               print_ctag(h, this);
        }
 }
 
        }
 }
 
+/*
+ * Close out all open elements up to but excluding suntil.
+ * Note that a paragraph just inside stays open together with it
+ * because paragraphs include subsequent phrasing content.
+ */
 void
 print_stagq(struct html *h, const struct tag *suntil)
 {
 void
 print_stagq(struct html *h, const struct tag *suntil)
 {
-       struct tag      *tag;
+       struct tag      *this, *next;
 
 
-       while ((tag = h->tags.head) != NULL) {
-               if (suntil && tag == suntil)
-                       return;
-               print_ctag(h, tag);
+       for (this = h->tag; this != NULL; this = next) {
+               next = this->next;
+               if (this == suntil || (next == suntil &&
+                   (this->tag == TAG_P || this->tag == TAG_PRE)))
+                       break;
+               print_ctag(h, this);
        }
 }
 
        }
 }
 
-void
-print_paragraph(struct html *h)
-{
-       struct tag      *t;
-
-       t = print_otag(h, TAG_DIV, "c", "Pp");
-       print_tagq(h, t);
-}
-
 
 /***********************************************************************
  * Low level output functions.
 
 /***********************************************************************
  * Low level output functions.
@@ -880,15 +1082,12 @@ print_indent(struct html *h)
 {
        size_t   i;
 
 {
        size_t   i;
 
-       if (h->col)
+       if (h->col || h->noindent)
                return;
 
                return;
 
-       if (h->noindent == 0) {
-               h->col = h->indent * 2;
-               for (i = 0; i < h->col; i++)
-                       putchar(' ');
-       }
-       h->flags &= ~HTML_NOSPACE;
+       h->col = h->indent * 2;
+       for (i = 0; i < h->col; i++)
+               putchar(' ');
 }
 
 /*
 }
 
 /*
@@ -901,18 +1100,3 @@ print_word(struct html *h, const char *cp)
        while (*cp != '\0')
                print_byte(h, *cp++);
 }
        while (*cp != '\0')
                print_byte(h, *cp++);
 }
-
-/*
- * 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)
-{
-       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