From 6b21ebaff4af30f3415bd32d79d72952f3e89fab Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Fri, 17 Dec 2010 00:18:29 +0000 Subject: Significantly clean up Sh, Ss, SH, and SS handling in -Thtml. Now a top-level DIV is used with only an H1 or H2 as the section header. This makes manuals much more readable in lynx, less complicated, and relegates left-margin widths to example.style.css. --- man_html.c | 70 ++++++++++++-------------------------------------------------- 1 file changed, 13 insertions(+), 57 deletions(-) (limited to 'man_html.c') diff --git a/man_html.c b/man_html.c index e314bc93..bd2aa00d 100644 --- a/man_html.c +++ b/man_html.c @@ -1,4 +1,4 @@ -/* $Id: man_html.c,v 1.53 2010/12/15 17:19:41 kristaps Exp $ */ +/* $Id: man_html.c,v 1.54 2010/12/17 00:18:29 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons * @@ -375,35 +375,16 @@ man_br_pre(MAN_ARGS) static int man_SH_pre(MAN_ARGS) { - struct htmlpair tag[2]; - struct roffsu su; + struct htmlpair tag; - if (MAN_BODY == n->type) { - SCALE_HS_INIT(&su, INDENT); - bufcat_su(h, "margin-left", &su); - PAIR_CLASS_INIT(&tag[0], "sec-body"); - PAIR_STYLE_INIT(&tag[1], h); - print_otag(h, TAG_DIV, 2, tag); + if (MAN_BLOCK == n->type) { + PAIR_CLASS_INIT(&tag, "section"); + print_otag(h, TAG_DIV, 1, &tag); return(1); - } else if (MAN_BLOCK == n->type) { - PAIR_CLASS_INIT(&tag[0], "sec-block"); - if (n->prev && MAN_SH == n->prev->tok) - if (NULL == n->prev->body->child) { - print_otag(h, TAG_DIV, 1, tag); - return(1); - } - - SCALE_VS_INIT(&su, 1); - bufcat_su(h, "margin-top", &su); - if (NULL == n->next) - bufcat_su(h, "margin-bottom", &su); - PAIR_STYLE_INIT(&tag[1], h); - print_otag(h, TAG_DIV, 2, tag); + } else if (MAN_BODY == n->type) return(1); - } - PAIR_CLASS_INIT(&tag[0], "sec-head"); - print_otag(h, TAG_DIV, 1, tag); + print_otag(h, TAG_H1, 0, NULL); return(1); } @@ -488,41 +469,16 @@ man_SM_pre(MAN_ARGS) static int man_SS_pre(MAN_ARGS) { - struct htmlpair tag[3]; - struct roffsu su; - - SCALE_VS_INIT(&su, 1); - - if (MAN_BODY == n->type) { - PAIR_CLASS_INIT(&tag[0], "ssec-body"); - if (n->parent->next && n->child) { - bufcat_su(h, "margin-bottom", &su); - PAIR_STYLE_INIT(&tag[1], h); - print_otag(h, TAG_DIV, 2, tag); - return(1); - } + struct htmlpair tag; - print_otag(h, TAG_DIV, 1, tag); + if (MAN_BLOCK == n->type) { + PAIR_CLASS_INIT(&tag, "subsection"); + print_otag(h, TAG_DIV, 1, &tag); return(1); - } else if (MAN_BLOCK == n->type) { - PAIR_CLASS_INIT(&tag[0], "ssec-block"); - if (n->prev && MAN_SS == n->prev->tok) - if (n->prev->body->child) { - bufcat_su(h, "margin-top", &su); - PAIR_STYLE_INIT(&tag[1], h); - print_otag(h, TAG_DIV, 2, tag); - return(1); - } - - print_otag(h, TAG_DIV, 1, tag); + } else if (MAN_BODY == n->type) return(1); - } - SCALE_HS_INIT(&su, INDENT - HALFINDENT); - bufcat_su(h, "margin-left", &su); - PAIR_CLASS_INIT(&tag[0], "ssec-head"); - PAIR_STYLE_INIT(&tag[1], h); - print_otag(h, TAG_DIV, 2, tag); + print_otag(h, TAG_H2, 0, NULL); return(1); } -- cgit v1.2.3-56-ge451