=================================================================== RCS file: /cvs/mandoc/man_html.c,v retrieving revision 1.118 retrieving revision 1.124 diff -u -p -r1.118 -r1.124 --- mandoc/man_html.c 2015/09/26 00:54:03 1.118 +++ mandoc/man_html.c 2017/01/18 19:22:22 1.124 @@ -1,7 +1,7 @@ -/* $Id: man_html.c,v 1.118 2015/09/26 00:54:03 schwarze Exp $ */ +/* $Id: man_html.c,v 1.124 2017/01/18 19:22:22 schwarze Exp $ */ /* * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons - * Copyright (c) 2013, 2014, 2015 Ingo Schwarze + * Copyright (c) 2013, 2014, 2015, 2017 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -147,40 +147,37 @@ void html_man(void *arg, const struct roff_man *man) { struct mhtml mh; - struct htmlpair tag; struct html *h; struct tag *t, *tt; memset(&mh, 0, sizeof(mh)); - PAIR_CLASS_INIT(&tag, "mandoc"); h = (struct html *)arg; if ( ! (HTML_FRAGMENT & h->oflags)) { print_gen_decls(h); - t = print_otag(h, TAG_HTML, 0, NULL); - tt = print_otag(h, TAG_HEAD, 0, NULL); + t = print_otag(h, TAG_HTML, ""); + tt = print_otag(h, TAG_HEAD, ""); print_man_head(&man->meta, man->first, &mh, h); print_tagq(h, tt); - print_otag(h, TAG_BODY, 0, NULL); - print_otag(h, TAG_DIV, 1, &tag); + print_otag(h, TAG_BODY, ""); + print_otag(h, TAG_DIV, "c", "mandoc"); } else - t = print_otag(h, TAG_DIV, 1, &tag); + t = print_otag(h, TAG_DIV, "c", "mandoc"); print_man_nodelist(&man->meta, man->first, &mh, h); print_tagq(h, t); - putchar('\n'); } static void print_man_head(MAN_ARGS) { + char *cp; print_gen_head(h); - assert(man->title); - assert(man->msec); - bufcat_fmt(h, "%s(%s)", man->title, man->msec); - print_otag(h, TAG_TITLE, 0, NULL); - print_text(h, h->buf); + mandoc_asprintf(&cp, "%s(%s)", man->title, man->msec); + print_otag(h, TAG_TITLE, ""); + print_text(h, cp); + free(cp); } static void @@ -211,14 +208,14 @@ print_man_node(MAN_ARGS) print_paragraph(h); return; } - if (n->flags & MAN_LINE && (*n->string == ' ' || + if (n->flags & NODE_LINE && (*n->string == ' ' || (n->prev != NULL && mh->fl & MANH_LITERAL && ! (h->flags & HTML_NONEWLINE)))) - print_otag(h, TAG_BR, 0, NULL); + print_otag(h, TAG_BR, ""); print_text(h, n->string); return; case ROFFT_EQN: - if (n->flags & MAN_LINE) + if (n->flags & NODE_LINE) putchar('\n'); print_eqn(h, n->eqn); break; @@ -278,17 +275,16 @@ a2width(const struct roff_node *n, struct roffsu *su) { if (n->type != ROFFT_TEXT) - return(0); + return 0; if (a2roffsu(n->string, su, SCALE_EN)) - return(1); + return 1; - return(0); + return 0; } static void man_root_pre(MAN_ARGS) { - struct htmlpair tag; struct tag *t, *tt; char *title; @@ -296,26 +292,20 @@ man_root_pre(MAN_ARGS) assert(man->msec); mandoc_asprintf(&title, "%s(%s)", man->title, man->msec); - PAIR_CLASS_INIT(&tag, "head"); - t = print_otag(h, TAG_TABLE, 1, &tag); + t = print_otag(h, TAG_TABLE, "c", "head"); + print_otag(h, TAG_TBODY, ""); + tt = print_otag(h, TAG_TR, ""); - print_otag(h, TAG_TBODY, 0, NULL); - - tt = print_otag(h, TAG_TR, 0, NULL); - - PAIR_CLASS_INIT(&tag, "head-ltitle"); - print_otag(h, TAG_TD, 1, &tag); + print_otag(h, TAG_TD, "c", "head-ltitle"); print_text(h, title); print_stagq(h, tt); - PAIR_CLASS_INIT(&tag, "head-vol"); - print_otag(h, TAG_TD, 1, &tag); + print_otag(h, TAG_TD, "c", "head-vol"); if (NULL != man->vol) print_text(h, man->vol); print_stagq(h, tt); - PAIR_CLASS_INIT(&tag, "head-rtitle"); - print_otag(h, TAG_TD, 1, &tag); + print_otag(h, TAG_TD, "c", "head-rtitle"); print_text(h, title); print_tagq(h, t); free(title); @@ -324,24 +314,16 @@ man_root_pre(MAN_ARGS) static void man_root_post(MAN_ARGS) { - struct htmlpair tag; struct tag *t, *tt; - PAIR_CLASS_INIT(&tag, "foot"); - t = print_otag(h, TAG_TABLE, 1, &tag); + t = print_otag(h, TAG_TABLE, "c", "foot"); + tt = print_otag(h, TAG_TR, ""); - tt = print_otag(h, TAG_TR, 0, NULL); - - PAIR_CLASS_INIT(&tag, "foot-date"); - print_otag(h, TAG_TD, 1, &tag); - - assert(man->date); + print_otag(h, TAG_TD, "c", "foot-date"); print_text(h, man->date); print_stagq(h, tt); - PAIR_CLASS_INIT(&tag, "foot-os"); - print_otag(h, TAG_TD, 1, &tag); - + print_otag(h, TAG_TD, "c", "foot-os"); if (man->os) print_text(h, man->os); print_tagq(h, t); @@ -352,7 +334,6 @@ static int man_br_pre(MAN_ARGS) { struct roffsu su; - struct htmlpair tag; SCALE_VS_INIT(&su, 1); @@ -363,32 +344,26 @@ man_br_pre(MAN_ARGS) } else su.scale = 0.0; - bufinit(h); - bufcat_su(h, "height", &su); - PAIR_STYLE_INIT(&tag, h); - print_otag(h, TAG_DIV, 1, &tag); + print_otag(h, TAG_DIV, "suh", &su); /* So the div isn't empty: */ print_text(h, "\\~"); - return(0); + return 0; } static int man_SH_pre(MAN_ARGS) { - struct htmlpair tag; - if (n->type == ROFFT_BLOCK) { mh->fl &= ~MANH_LITERAL; - PAIR_CLASS_INIT(&tag, "section"); - print_otag(h, TAG_DIV, 1, &tag); - return(1); + print_otag(h, TAG_DIV, "c", "section"); + return 1; } else if (n->type == ROFFT_BODY) - return(1); + return 1; - print_otag(h, TAG_H1, 0, NULL); - return(1); + print_otag(h, TAG_H1, ""); + return 1; } static int @@ -400,7 +375,7 @@ man_alt_pre(MAN_ARGS) struct tag *t; if ((savelit = mh->fl & MANH_LITERAL)) - print_otag(h, TAG_BR, 0, NULL); + print_otag(h, TAG_BR, ""); mh->fl &= ~MANH_LITERAL; @@ -433,7 +408,7 @@ man_alt_pre(MAN_ARGS) h->flags |= HTML_NOSPACE; if (TAG_MAX != fp) - t = print_otag(h, fp, 0, NULL); + t = print_otag(h, fp, ""); print_man_node(man, nn, mh, h); @@ -444,34 +419,30 @@ man_alt_pre(MAN_ARGS) if (savelit) mh->fl |= MANH_LITERAL; - return(0); + return 0; } static int man_SM_pre(MAN_ARGS) { - - print_otag(h, TAG_SMALL, 0, NULL); + print_otag(h, TAG_SMALL, ""); if (MAN_SB == n->tok) - print_otag(h, TAG_B, 0, NULL); - return(1); + print_otag(h, TAG_B, ""); + return 1; } static int man_SS_pre(MAN_ARGS) { - struct htmlpair tag; - if (n->type == ROFFT_BLOCK) { mh->fl &= ~MANH_LITERAL; - PAIR_CLASS_INIT(&tag, "subsection"); - print_otag(h, TAG_DIV, 1, &tag); - return(1); + print_otag(h, TAG_DIV, "c", "subsection"); + return 1; } else if (n->type == ROFFT_BODY) - return(1); + return 1; - print_otag(h, TAG_H2, 0, NULL); - return(1); + print_otag(h, TAG_H2, ""); + return 1; } static int @@ -479,11 +450,11 @@ man_PP_pre(MAN_ARGS) { if (n->type == ROFFT_HEAD) - return(0); + return 0; else if (n->type == ROFFT_BLOCK) print_bvspace(h, n); - return(1); + return 1; } static int @@ -492,16 +463,16 @@ man_IP_pre(MAN_ARGS) const struct roff_node *nn; if (n->type == ROFFT_BODY) { - print_otag(h, TAG_DD, 0, NULL); - return(1); + print_otag(h, TAG_DD, ""); + return 1; } else if (n->type != ROFFT_HEAD) { - print_otag(h, TAG_DL, 0, NULL); - return(1); + print_otag(h, TAG_DL, ""); + return 1; } /* FIXME: width specification. */ - print_otag(h, TAG_DT, 0, NULL); + print_otag(h, TAG_DT, ""); /* For IP, only print the first header element. */ @@ -512,7 +483,7 @@ man_IP_pre(MAN_ARGS) if (MAN_TP == n->tok) { nn = n->child; - while (NULL != nn && 0 == (MAN_LINE & nn->flags)) + while (NULL != nn && 0 == (NODE_LINE & nn->flags)) nn = nn->next; while (NULL != nn) { print_man_node(man, nn, mh, h); @@ -520,81 +491,72 @@ man_IP_pre(MAN_ARGS) } } - return(0); + return 0; } static int man_HP_pre(MAN_ARGS) { - struct htmlpair tag[2]; - struct roffsu su; + struct roffsu sum, sui; const struct roff_node *np; if (n->type == ROFFT_HEAD) - return(0); + return 0; else if (n->type != ROFFT_BLOCK) - return(1); + return 1; np = n->head->child; - if (NULL == np || ! a2width(np, &su)) - SCALE_HS_INIT(&su, INDENT); + if (np == NULL || !a2width(np, &sum)) + SCALE_HS_INIT(&sum, INDENT); - bufinit(h); + sui.unit = sum.unit; + sui.scale = -sum.scale; print_bvspace(h, n); - bufcat_su(h, "margin-left", &su); - su.scale = -su.scale; - bufcat_su(h, "text-indent", &su); - PAIR_STYLE_INIT(&tag[0], h); - PAIR_CLASS_INIT(&tag[1], "spacer"); - print_otag(h, TAG_DIV, 2, tag); - return(1); + print_otag(h, TAG_DIV, "csului", "spacer", &sum, &sui); + return 1; } static int man_OP_pre(MAN_ARGS) { struct tag *tt; - struct htmlpair tag; print_text(h, "["); h->flags |= HTML_NOSPACE; - PAIR_CLASS_INIT(&tag, "opt"); - tt = print_otag(h, TAG_SPAN, 1, &tag); + tt = print_otag(h, TAG_SPAN, "c", "opt"); if (NULL != (n = n->child)) { - print_otag(h, TAG_B, 0, NULL); + print_otag(h, TAG_B, ""); print_text(h, n->string); } print_stagq(h, tt); if (NULL != n && NULL != n->next) { - print_otag(h, TAG_I, 0, NULL); + print_otag(h, TAG_I, ""); print_text(h, n->next->string); } print_stagq(h, tt); h->flags |= HTML_NOSPACE; print_text(h, "]"); - return(0); + return 0; } static int man_B_pre(MAN_ARGS) { - - print_otag(h, TAG_B, 0, NULL); - return(1); + print_otag(h, TAG_B, ""); + return 1; } static int man_I_pre(MAN_ARGS) { - - print_otag(h, TAG_I, 0, NULL); - return(1); + print_otag(h, TAG_I, ""); + return 1; } static int @@ -602,70 +564,61 @@ man_literal_pre(MAN_ARGS) { if (MAN_fi == n->tok || MAN_EE == n->tok) { - print_otag(h, TAG_BR, 0, NULL); + print_otag(h, TAG_BR, ""); mh->fl &= ~MANH_LITERAL; } else mh->fl |= MANH_LITERAL; - return(0); + return 0; } static int man_in_pre(MAN_ARGS) { - - print_otag(h, TAG_BR, 0, NULL); - return(0); + print_otag(h, TAG_BR, ""); + return 0; } static int man_ign_pre(MAN_ARGS) { - return(0); + return 0; } static int man_RS_pre(MAN_ARGS) { - struct htmlpair tag; struct roffsu su; if (n->type == ROFFT_HEAD) - return(0); + return 0; else if (n->type == ROFFT_BODY) - return(1); + return 1; SCALE_HS_INIT(&su, INDENT); if (n->head->child) a2width(n->head->child, &su); - bufinit(h); - bufcat_su(h, "margin-left", &su); - PAIR_STYLE_INIT(&tag, h); - print_otag(h, TAG_DIV, 1, &tag); - return(1); + print_otag(h, TAG_DIV, "sul", &su); + return 1; } static int man_UR_pre(MAN_ARGS) { - struct htmlpair tag[2]; - n = n->child; assert(n->type == ROFFT_HEAD); - if (n->nchild) { + if (n->child != NULL) { assert(n->child->type == ROFFT_TEXT); - PAIR_CLASS_INIT(&tag[0], "link-ext"); - PAIR_HREF_INIT(&tag[1], n->child->string); - print_otag(h, TAG_A, 2, tag); + print_otag(h, TAG_A, "ch", "link-ext", n->child->string); } assert(n->next->type == ROFFT_BODY); - if (n->next->nchild) + if (n->next->child != NULL) n = n->next; print_man_nodelist(man, n->child, mh, h); - return(0); + return 0; }