Fix multiple aspects of SYNOPSIS .Nm formatting:

* Don't break lines before non-block .Nm elements.
* Use proper <b> markup for the heads of .Nm blocks.
* Make the width measurements work by doing them on the head children.

diff --git a/mdoc_html.c b/mdoc_html.c
index fb37f7e1bbddf50af5df2d57aa645a8b41975ba0..eefb79661a63c4b82065d356a465c39048d8c652 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_html.c,v 1.233 2015/08/30 19:00:14 schwarze Exp $ */
+/*     $Id: mdoc_html.c,v 1.234 2015/09/26 00:22:07 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -642,7 +642,6 @@ mdoc_nm_pre(MDOC_ARGS)
 
        switch (n->type) {
        case ROFFT_ELEM:
-               synopsis_pre(h, n);
                PAIR_CLASS_INIT(&tag, "name");
                print_otag(h, TAG_B, 1, &tag);
                if (NULL == n->child && meta->name)
@@ -650,6 +649,8 @@ mdoc_nm_pre(MDOC_ARGS)
                return(1);
        case ROFFT_HEAD:
                print_otag(h, TAG_TD, 0, NULL);
+               PAIR_CLASS_INIT(&tag, "name");
+               print_otag(h, TAG_B, 1, &tag);
                if (NULL == n->child && meta->name)
                        print_text(h, meta->name);
                return(1);
@@ -664,7 +665,7 @@ mdoc_nm_pre(MDOC_ARGS)
        PAIR_CLASS_INIT(&tag, "synopsis");
        print_otag(h, TAG_TABLE, 1, &tag);
 
-       for (len = 0, n = n->child; n; n = n->next)
+       for (len = 0, n = n->head->child; n; n = n->next)
                if (n->type == ROFFT_TEXT)
                        len += html_strlen(n->string);