=================================================================== RCS file: /cvs/mandoc/man_html.c,v retrieving revision 1.125 retrieving revision 1.130 diff -u -p -r1.125 -r1.130 --- mandoc/man_html.c 2017/01/19 01:00:14 1.125 +++ mandoc/man_html.c 2017/01/26 18:28:18 1.130 @@ -1,4 +1,4 @@ -/* $Id: man_html.c,v 1.125 2017/01/19 01:00:14 schwarze Exp $ */ +/* $Id: man_html.c,v 1.130 2017/01/26 18:28:18 schwarze Exp $ */ /* * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons * Copyright (c) 2013, 2014, 2015, 2017 Ingo Schwarze @@ -32,7 +32,6 @@ #include "html.h" #include "main.h" -/* TODO: preserve ident widths. */ /* FIXME: have PD set the default vspace width. */ #define INDENT 5 @@ -43,8 +42,7 @@ struct html *h struct mhtml { - int fl; -#define MANH_LITERAL (1 << 0) /* literal context */ + struct tag *nofill; }; struct htmlman { @@ -72,9 +70,9 @@ static int man_SS_pre(MAN_ARGS); static int man_UR_pre(MAN_ARGS); static int man_alt_pre(MAN_ARGS); static int man_br_pre(MAN_ARGS); +static int man_fill_pre(MAN_ARGS); static int man_ign_pre(MAN_ARGS); static int man_in_pre(MAN_ARGS); -static int man_literal_pre(MAN_ARGS); static void man_root_post(MAN_ARGS); static void man_root_pre(MAN_ARGS); @@ -101,8 +99,8 @@ static const struct htmlman mans[MAN_MAX] = { { man_alt_pre, NULL }, /* IR */ { man_alt_pre, NULL }, /* RI */ { man_br_pre, NULL }, /* sp */ - { man_literal_pre, NULL }, /* nf */ - { man_literal_pre, NULL }, /* fi */ + { man_fill_pre, NULL }, /* nf */ + { man_fill_pre, NULL }, /* fi */ { NULL, NULL }, /* RE */ { man_RS_pre, NULL }, /* RS */ { man_ign_pre, NULL }, /* DT */ @@ -112,8 +110,8 @@ static const struct htmlman mans[MAN_MAX] = { { man_in_pre, NULL }, /* in */ { man_ign_pre, NULL }, /* ft */ { man_OP_pre, NULL }, /* OP */ - { man_literal_pre, NULL }, /* EX */ - { man_literal_pre, NULL }, /* EE */ + { man_fill_pre, NULL }, /* EX */ + { man_fill_pre, NULL }, /* EE */ { man_UR_pre, NULL }, /* UR */ { NULL, NULL }, /* UE */ { man_ign_pre, NULL }, /* ll */ @@ -148,24 +146,26 @@ html_man(void *arg, const struct roff_man *man) { struct mhtml mh; struct html *h; - struct tag *t, *tt; + struct tag *t; - memset(&mh, 0, sizeof(mh)); + mh.nofill = NULL; h = (struct html *)arg; - if ( ! (HTML_FRAGMENT & h->oflags)) { + if ((h->oflags & HTML_FRAGMENT) == 0) { print_gen_decls(h); - t = print_otag(h, TAG_HTML, ""); - tt = print_otag(h, TAG_HEAD, ""); + print_otag(h, TAG_HTML, ""); + t = print_otag(h, TAG_HEAD, ""); print_man_head(&man->meta, man->first, &mh, h); - print_tagq(h, tt); + print_tagq(h, t); print_otag(h, TAG_BODY, ""); - print_otag(h, TAG_DIV, "c", "mandoc"); - } else - t = print_otag(h, TAG_DIV, "c", "mandoc"); + } - print_man_nodelist(&man->meta, man->first, &mh, h); + man_root_pre(&man->meta, man->first, &mh, h); + t = print_otag(h, TAG_DIV, "c", "manual-text"); + print_man_nodelist(&man->meta, man->first->child, &mh, h); print_tagq(h, t); + man_root_post(&man->meta, man->first, &mh, h); + print_tagq(h, NULL); } static void @@ -198,22 +198,20 @@ print_man_node(MAN_ARGS) child = 1; t = h->tags.head; + if (t == mh->nofill) + t = t->next; switch (n->type) { - case ROFFT_ROOT: - man_root_pre(man, n, mh, h); - break; case ROFFT_TEXT: if ('\0' == *n->string) { print_paragraph(h); return; } - if (n->flags & NODE_LINE && (*n->string == ' ' || - (n->prev != NULL && mh->fl & MANH_LITERAL && - ! (h->flags & HTML_NONEWLINE)))) + if (mh->nofill == NULL && + n->flags & NODE_LINE && *n->string == ' ') print_otag(h, TAG_BR, ""); print_text(h, n->string); - return; + break; case ROFFT_EQN: print_eqn(h, n->eqn); break; @@ -253,19 +251,15 @@ print_man_node(MAN_ARGS) print_man_nodelist(man, n->child, mh, h); /* This will automatically close out any font scope. */ - print_stagq(h, t); + print_stagq(h, mh->nofill == NULL ? t : mh->nofill); - switch (n->type) { - case ROFFT_ROOT: - man_root_post(man, n, mh, h); - break; - case ROFFT_EQN: - break; - default: - if (mans[n->tok].post) - (*mans[n->tok].post)(man, n, mh, h); - break; - } + if (n->type != ROFFT_TEXT && n->type != ROFFT_EQN && + mans[n->tok].post != NULL) + (*mans[n->tok].post)(man, n, mh, h); + + if (mh->nofill != NULL && + (n->next == NULL || n->next->flags & NODE_LINE)) + print_endline(h); } static int @@ -353,14 +347,11 @@ man_br_pre(MAN_ARGS) static int man_SH_pre(MAN_ARGS) { - if (n->type == ROFFT_BLOCK) { - mh->fl &= ~MANH_LITERAL; - print_otag(h, TAG_DIV, "c", "section"); - return 1; - } else if (n->type == ROFFT_BODY) - return 1; - - print_otag(h, TAG_H1, ""); + if (n->type == ROFFT_BLOCK && mh->nofill != NULL) { + print_tagq(h, mh->nofill); + mh->nofill = NULL; + } else if (n->type == ROFFT_HEAD) + print_otag(h, TAG_H1, "c", "Sh"); return 1; } @@ -368,17 +359,11 @@ static int man_alt_pre(MAN_ARGS) { const struct roff_node *nn; - int i, savelit; + int i; enum htmltag fp; struct tag *t; - if ((savelit = mh->fl & MANH_LITERAL)) - print_otag(h, TAG_BR, ""); - - mh->fl &= ~MANH_LITERAL; - for (i = 0, nn = n->child; nn; nn = nn->next, i++) { - t = NULL; switch (n->tok) { case MAN_BI: fp = i % 2 ? TAG_I : TAG_B; @@ -405,18 +390,14 @@ man_alt_pre(MAN_ARGS) if (i) h->flags |= HTML_NOSPACE; - if (TAG_MAX != fp) + if (fp != TAG_MAX) t = print_otag(h, fp, ""); - print_man_node(man, nn, mh, h); + print_text(h, nn->string); - if (t) + if (fp != TAG_MAX) print_tagq(h, t); } - - if (savelit) - mh->fl |= MANH_LITERAL; - return 0; } @@ -432,14 +413,11 @@ man_SM_pre(MAN_ARGS) static int man_SS_pre(MAN_ARGS) { - if (n->type == ROFFT_BLOCK) { - mh->fl &= ~MANH_LITERAL; - print_otag(h, TAG_DIV, "c", "subsection"); - return 1; - } else if (n->type == ROFFT_BODY) - return 1; - - print_otag(h, TAG_H2, ""); + if (n->type == ROFFT_BLOCK && mh->nofill != NULL) { + print_tagq(h, mh->nofill); + mh->nofill = NULL; + } else if (n->type == ROFFT_HEAD) + print_otag(h, TAG_H2, "c", "Ss"); return 1; } @@ -461,16 +439,16 @@ man_IP_pre(MAN_ARGS) const struct roff_node *nn; if (n->type == ROFFT_BODY) { - print_otag(h, TAG_DD, ""); + print_otag(h, TAG_DD, "c", "It-tag"); return 1; } else if (n->type != ROFFT_HEAD) { - print_otag(h, TAG_DL, ""); + print_otag(h, TAG_DL, "c", "Bl-tag"); return 1; } /* FIXME: width specification. */ - print_otag(h, TAG_DT, ""); + print_otag(h, TAG_DT, "c", "It-tag"); /* For IP, only print the first header element. */ @@ -512,7 +490,7 @@ man_HP_pre(MAN_ARGS) sui.scale = -sum.scale; print_bvspace(h, n); - print_otag(h, TAG_DIV, "csului", "spacer", &sum, &sui); + print_otag(h, TAG_DIV, "csului", "Pp", &sum, &sui); return 1; } @@ -523,7 +501,7 @@ man_OP_pre(MAN_ARGS) print_text(h, "["); h->flags |= HTML_NOSPACE; - tt = print_otag(h, TAG_SPAN, "c", "opt"); + tt = print_otag(h, TAG_SPAN, "c", "Op"); if (NULL != (n = n->child)) { print_otag(h, TAG_B, ""); @@ -558,15 +536,20 @@ man_I_pre(MAN_ARGS) } static int -man_literal_pre(MAN_ARGS) +man_fill_pre(MAN_ARGS) { - if (MAN_fi == n->tok || MAN_EE == n->tok) { - print_otag(h, TAG_BR, ""); - mh->fl &= ~MANH_LITERAL; - } else - mh->fl |= MANH_LITERAL; - + if (mh->nofill != NULL) { + print_tagq(h, mh->nofill); + mh->nofill = NULL; + } else + print_otag(h, TAG_BR, ""); + } else { + if (mh->nofill == NULL) + mh->nofill = print_otag(h, TAG_PRE, ""); + else + print_otag(h, TAG_BR, ""); + } return 0; } @@ -609,7 +592,7 @@ man_UR_pre(MAN_ARGS) assert(n->type == ROFFT_HEAD); if (n->child != NULL) { assert(n->child->type == ROFFT_TEXT); - print_otag(h, TAG_A, "ch", "link-ext", n->child->string); + print_otag(h, TAG_A, "ch", "Lk", n->child->string); } assert(n->next->type == ROFFT_BODY);