From c98ce981175cb88e7fb0214a8c3b8751dd096a9b Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Sat, 26 Sep 2015 00:18:05 +0000 Subject: Fix multiple aspects of SYNOPSIS .Nm formatting: * Don't break lines before non-block .Nm elements. * Use proper markup for the heads of .Nm blocks. * Make the width measurements work by doing them on the head children. --- usr.bin/mandoc/mdoc_html.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'usr.bin/mandoc/mdoc_html.c') diff --git a/usr.bin/mandoc/mdoc_html.c b/usr.bin/mandoc/mdoc_html.c index e2605c1b9ca..4a35c66ac92 100644 --- a/usr.bin/mandoc/mdoc_html.c +++ b/usr.bin/mandoc/mdoc_html.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mdoc_html.c,v 1.108 2015/08/30 18:59:44 schwarze Exp $ */ +/* $OpenBSD: mdoc_html.c,v 1.109 2015/09/26 00:18:04 schwarze Exp $ */ /* * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons * Copyright (c) 2014, 2015 Ingo Schwarze @@ -640,7 +640,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) @@ -648,6 +647,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); @@ -662,7 +663,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); -- cgit v1.2.3