=================================================================== RCS file: /cvs/mandoc/tbl_html.c,v retrieving revision 1.28 retrieving revision 1.34 diff -u -p -r1.28 -r1.34 --- mandoc/tbl_html.c 2018/11/26 01:51:46 1.28 +++ mandoc/tbl_html.c 2021/05/16 18:11:20 1.34 @@ -1,7 +1,7 @@ -/* $Id: tbl_html.c,v 1.28 2018/11/26 01:51:46 schwarze Exp $ */ +/* $Id: tbl_html.c,v 1.34 2021/05/16 18:11:20 schwarze Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons - * Copyright (c) 2014, 2015, 2017, 2018 Ingo Schwarze + * Copyright (c) 2014,2015,2017,2018,2021 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 @@ -25,6 +25,8 @@ #include #include "mandoc.h" +#include "roff.h" +#include "tbl.h" #include "out.h" #include "html.h" @@ -79,6 +81,7 @@ html_tbl_sulen(const struct roffsu *su, void *arg) static void html_tblopen(struct html *h, const struct tbl_span *sp) { + html_close_paragraph(h); if (h->tbl.cols == NULL) { h->tbl.len = html_tbl_len; h->tbl.slen = html_tbl_strlen; @@ -86,7 +89,15 @@ html_tblopen(struct html *h, const struct tbl_span *sp tblcalc(&h->tbl, sp, 0, 0); } assert(NULL == h->tblt); - h->tblt = print_otag(h, TAG_TABLE, "c", "tbl"); + h->tblt = print_otag(h, TAG_TABLE, "c?ss", "tbl", + "border", + sp->opts->opts & TBL_OPT_ALLBOX ? "1" : NULL, + "border-style", + sp->opts->opts & TBL_OPT_DBOX ? "double" : + sp->opts->opts & TBL_OPT_BOX ? "solid" : NULL, + "border-top-style", + sp->pos == TBL_SPAN_DHORIZ ? "double" : + sp->pos == TBL_SPAN_HORIZ ? "solid" : NULL); } void @@ -102,87 +113,143 @@ void print_tbl(struct html *h, const struct tbl_span *sp) { const struct tbl_dat *dp; + const struct tbl_cell *cp; + const struct tbl_span *psp; struct tag *tt; const char *hspans, *vspans, *halign, *valign; + const char *bborder, *lborder, *rborder; char hbuf[4], vbuf[4]; + enum mandoc_esc save_font; + int i; - /* Inhibit printing of spaces: we do padding ourselves. */ - if (h->tblt == NULL) html_tblopen(h, sp); - assert(h->tblt); + /* + * Horizontal lines spanning the whole table + * are handled by previous or following table rows. + */ + if (sp->pos != TBL_SPAN_DATA) + return; + + /* Inhibit printing of spaces: we do padding ourselves. */ + h->flags |= HTML_NONOSPACE; h->flags |= HTML_NOSPACE; - tt = print_otag(h, TAG_TR, ""); + /* Draw a vertical line left of this row? */ - switch (sp->pos) { - case TBL_SPAN_HORIZ: - case TBL_SPAN_DHORIZ: - print_otag(h, TAG_TD, "?", "colspan", "0"); + switch (sp->layout->vert) { + case 2: + lborder = "double"; break; + case 1: + lborder = "solid"; + break; default: - for (dp = sp->first; dp != NULL; dp = dp->next) { - print_stagq(h, tt); + lborder = NULL; + break; + } - /* - * Do not generate elements for continuations - * of spanned cells. Larger elements covering - * this space were already generated earlier. - */ + /* Draw a horizontal line below this row? */ - if (dp->layout->pos == TBL_CELL_SPAN || - dp->layout->pos == TBL_CELL_DOWN || - (dp->string != NULL && - strcmp(dp->string, "\\^") == 0)) - continue; + bborder = NULL; + if ((psp = sp->next) != NULL) { + switch (psp->pos) { + case TBL_SPAN_DHORIZ: + bborder = "double"; + break; + case TBL_SPAN_HORIZ: + bborder = "solid"; + break; + default: + break; + } + } - /* Determine the attribute values. */ + tt = print_otag(h, TAG_TR, "ss", + "border-left-style", lborder, + "border-bottom-style", bborder); - if (dp->hspans > 0) { - (void)snprintf(hbuf, sizeof(hbuf), - "%d", dp->hspans + 1); - hspans = hbuf; - } else - hspans = NULL; - if (dp->vspans > 0) { - (void)snprintf(vbuf, sizeof(vbuf), - "%d", dp->vspans + 1); - vspans = vbuf; - } else - vspans = NULL; + for (dp = sp->first; dp != NULL; dp = dp->next) { + print_stagq(h, tt); - switch (dp->layout->pos) { - case TBL_CELL_CENTRE: - halign = "center"; - break; - case TBL_CELL_RIGHT: - case TBL_CELL_NUMBER: - halign = "right"; - break; - default: - halign = NULL; - break; - } - if (dp->layout->flags & TBL_CELL_TALIGN) - valign = "top"; - else if (dp->layout->flags & TBL_CELL_BALIGN) - valign = "bottom"; - else - valign = NULL; + /* + * Do not generate elements for continuations + * of spanned cells. Larger elements covering + * this space were already generated earlier. + */ - /* Print the element and the attributes. */ + cp = dp->layout; + if (cp->pos == TBL_CELL_SPAN || cp->pos == TBL_CELL_DOWN || + (dp->string != NULL && strcmp(dp->string, "\\^") == 0)) + continue; - print_otag(h, TAG_TD, "??ss", - "colspan", hspans, "rowspan", vspans, - "vertical-align", valign, - "text-align", halign); - if (dp->string != NULL) - print_text(h, dp->string); + /* Determine the attribute values. */ + + if (dp->hspans > 0) { + (void)snprintf(hbuf, sizeof(hbuf), + "%d", dp->hspans + 1); + hspans = hbuf; + } else + hspans = NULL; + if (dp->vspans > 0) { + (void)snprintf(vbuf, sizeof(vbuf), + "%d", dp->vspans + 1); + vspans = vbuf; + } else + vspans = NULL; + + switch (cp->pos) { + case TBL_CELL_CENTRE: + halign = "center"; + break; + case TBL_CELL_RIGHT: + case TBL_CELL_NUMBER: + halign = "right"; + break; + default: + halign = NULL; + break; } - break; + if (cp->flags & TBL_CELL_TALIGN) + valign = "top"; + else if (cp->flags & TBL_CELL_BALIGN) + valign = "bottom"; + else + valign = NULL; + + for (i = dp->hspans; i > 0; i--) + cp = cp->next; + switch (cp->vert) { + case 2: + rborder = "double"; + break; + case 1: + rborder = "solid"; + break; + default: + rborder = NULL; + break; + } + + /* Print the element and the attributes. */ + + print_otag(h, TAG_TD, "??sss", + "colspan", hspans, "rowspan", vspans, + "vertical-align", valign, + "text-align", halign, + "border-right-style", rborder); + if (dp->string != NULL) { + save_font = h->metac; + if (dp->layout->flags & TBL_CELL_BOLD) + html_setfont(h, ESCAPE_FONTBOLD); + else if (dp->layout->flags & TBL_CELL_ITALIC) + html_setfont(h, ESCAPE_FONTITALIC); + print_text(h, dp->string); + html_setfont(h, save_font); + } } print_tagq(h, tt);