Use <span> for .Ms rather than <b>; discussed with John Gardner.

[mandoc.git] / html.c

diff --git a/html.c b/html.c
index d92ec16aee64017b17731a4072184b379c567625..60e883710a2f85cf87372c40fe758e2a90cdbcd0 100644 (file)
--- a/html.c
+++ b/html.c
@@ -1,7 +1,7 @@
-/*     $Id: html.c,v 1.214 2017/06/14 01:31:26 schwarze Exp $ */
+/*     $Id: html.c,v 1.228 2018/05/21 01:11:31 schwarze Exp $ */
 /*
  * 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, 2018 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
@@ -59,6 +59,7 @@ static        const struct htmldata htmltags[TAG_MAX] = {
        {"meta",        HTML_NOSTACK | HTML_AUTOCLOSE | HTML_NLALL},
        {"title",       HTML_NLAROUND},
        {"div",         HTML_NLAROUND},
+       {"div",         0},
        {"h1",          HTML_NLAROUND},
        {"h2",          HTML_NLAROUND},
        {"span",        0},
@@ -87,6 +88,7 @@ static        const struct htmldata htmltags[TAG_MAX] = {
        {"math",        HTML_NLALL | HTML_INDENT},
        {"mrow",        0},
        {"mi",          0},
+       {"mn",          0},
        {"mo",          0},
        {"msup",        0},
        {"msub",        0},
@@ -167,9 +169,14 @@ print_gen_head(struct html *h)
        struct tag      *t;
 
        print_otag(h, TAG_META, "?", "charset", "utf-8");
+       if (h->style != NULL) {
+               print_otag(h, TAG_LINK, "?h??", "rel", "stylesheet",
+                   h->style, "type", "text/css", "media", "all");
+               return;
+       }
 
        /*
-        * Print a default style-sheet.
+        * Print a minimal embedded style sheet.
         */
 
        t = print_otag(h, TAG_STYLE, "");
@@ -180,11 +187,23 @@ print_gen_head(struct html *h)
        print_text(h, "td.head-vol { text-align: center; }");
        print_endline(h);
        print_text(h, "div.Pp { margin: 1ex 0ex; }");
+       print_endline(h);
+       print_text(h, "div.Nd, div.Bf, div.Op { display: inline; }");
+       print_endline(h);
+       print_text(h, "span.Pa, span.Ad { font-style: italic; }");
+       print_endline(h);
+       print_text(h, "span.Ms { font-weight: bold; }");
+       print_endline(h);
+       print_text(h, "dl.Bl-diag ");
+       print_byte(h, '>');
+       print_text(h, " dt { font-weight: bold; }");
+       print_endline(h);
+       print_text(h, "code.Nm, code.Fl, code.Cm, code.Ic, "
+           "code.In, code.Fd, code.Fn,");
+       print_endline(h);
+       print_text(h, "code.Cd { font-weight: bold; "
+           "font-family: inherit; }");
        print_tagq(h, t);
-
-       if (h->style)
-               print_otag(h, TAG_LINK, "?h??", "rel", "stylesheet",
-                   h->style, "type", "text/css", "media", "all");
 }
 
 static void
@@ -249,6 +268,8 @@ html_make_id(const struct roff_node *n)
 
        buf = NULL;
        deroff(&buf, n);
+       if (buf == NULL)
+               return NULL;
 
        /* http://www.w3.org/TR/html5/dom.html#the-id-attribute */
 
@@ -452,7 +473,7 @@ print_encode(struct html *h, const char *p, const char *pend, int norecurse)
                    (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);
@@ -515,7 +536,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_word(h, "&#160;");
+                       print_word(h, "&#x00A0;");
                else {
                        if (h->flags & HTML_PREKEEP)
                                h->flags |= HTML_KEEP;
@@ -622,25 +643,29 @@ print_otag(struct html *h, enum htmltag tag, const char *fmt, ...)
                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':
-                       if ((arg2 = va_arg(ap, char *)) == NULL)
-                               break;
-                       su = &mysu;
-                       a2width(arg2, su);
+                       if ((arg2 = va_arg(ap, char *)) != NULL) {
+                               su = &mysu;
+                               a2width(arg2, su);
+                       }
+                       if (*fmt == '*') {
+                               if (su != NULL && su->unit == SCALE_EN &&
+                                   su->scale > 5.9 && su->scale < 6.1)
+                                       su = NULL;
+                               fmt++;
+                       }
                        if (*fmt == '+') {
-                               /* Increase to make even bold text fit. */
-                               su->scale *= 1.2;
-                               /* Add padding. */
-                               su->scale += 3.0;
+                               if (su != NULL) {
+                                       /* Make even bold text fit. */
+                                       su->scale *= 1.2;
+                                       /* Add padding. */
+                                       su->scale += 3.0;
+                               }
                                fmt++;
                        }
                        if (*fmt == '-') {
-                               su->scale *= -1.0;
+                               if (su != NULL)
+                                       su->scale *= -1.0;
                                fmt++;
                        }
                        break;
@@ -651,9 +676,6 @@ print_otag(struct html *h, enum htmltag tag, const char *fmt, ...)
                /* Second letter: style name. */
 
                switch (*fmt++) {
-               case 'b':
-                       attr = "margin-bottom";
-                       break;
                case 'h':
                        attr = "height";
                        break;
@@ -663,9 +685,6 @@ print_otag(struct html *h, enum htmltag tag, const char *fmt, ...)
                case 'l':
                        attr = "margin-left";
                        break;
-               case 't':
-                       attr = "margin-top";
-                       break;
                case 'w':
                        attr = "width";
                        break;
@@ -769,6 +788,32 @@ print_gen_decls(struct html *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)
 {
@@ -778,7 +823,7 @@ print_text(struct html *h, const char *word)
                                h->flags |= HTML_KEEP;
                        print_endword(h);
                } else
-                       print_word(h, "&#160;");
+                       print_word(h, "&#x00A0;");
        }
 
        assert(NULL == h->metaf);