=================================================================== RCS file: /cvs/mandoc/tbl_html.c,v retrieving revision 1.7 retrieving revision 1.27 diff -u -p -r1.7 -r1.27 --- mandoc/tbl_html.c 2011/01/13 14:30:13 1.7 +++ mandoc/tbl_html.c 2018/11/25 21:17:34 1.27 @@ -1,6 +1,7 @@ -/* $Id: tbl_html.c,v 1.7 2011/01/13 14:30:13 kristaps Exp $ */ +/* $Id: tbl_html.c,v 1.27 2018/11/25 21:17:34 schwarze Exp $ */ /* - * Copyright (c) 2009 Kristaps Dzonsons + * Copyright (c) 2011 Kristaps Dzonsons + * Copyright (c) 2014, 2015, 2017, 2018 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 @@ -14,10 +15,10 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif +#include + #include #include #include @@ -30,51 +31,62 @@ static void html_tblopen(struct html *, const struct tbl_span *); static size_t html_tbl_len(size_t, void *); static size_t html_tbl_strlen(const char *, void *); +static size_t html_tbl_sulen(const struct roffsu *, void *); -/* ARGSUSED */ + static size_t html_tbl_len(size_t sz, void *arg) { - - return(sz); + return sz; } -/* ARGSUSED */ static size_t html_tbl_strlen(const char *p, void *arg) { + return strlen(p); +} - return(strlen(p)); +static size_t +html_tbl_sulen(const struct roffsu *su, void *arg) +{ + if (su->scale < 0.0) + return 0; + + switch (su->unit) { + case SCALE_FS: /* 2^16 basic units */ + return su->scale * 65536.0 / 24.0; + case SCALE_IN: /* 10 characters per inch */ + return su->scale * 10.0; + case SCALE_CM: /* 2.54 cm per inch */ + return su->scale * 10.0 / 2.54; + case SCALE_PC: /* 6 pica per inch */ + case SCALE_VS: + return su->scale * 10.0 / 6.0; + case SCALE_EN: + case SCALE_EM: + return su->scale; + case SCALE_PT: /* 12 points per pica */ + return su->scale * 10.0 / 6.0 / 12.0; + case SCALE_BU: /* 24 basic units per character */ + return su->scale / 24.0; + case SCALE_MM: /* 1/1000 inch */ + return su->scale / 100.0; + default: + abort(); + } } static void html_tblopen(struct html *h, const struct tbl_span *sp) { - const struct tbl_head *hp; - struct htmlpair tag; - struct roffsu su; - struct roffcol *col; - - if (TBL_SPAN_FIRST & sp->flags) { + if (h->tbl.cols == NULL) { h->tbl.len = html_tbl_len; h->tbl.slen = html_tbl_strlen; - tblcalc(&h->tbl, sp); + h->tbl.sulen = html_tbl_sulen; + tblcalc(&h->tbl, sp, 0, 0); } - assert(NULL == h->tblt); - PAIR_CLASS_INIT(&tag, "tbl"); - h->tblt = print_otag(h, TAG_TABLE, 1, &tag); - - for (hp = sp->head; hp; hp = hp->next) { - bufinit(h); - col = &h->tbl.cols[hp->ident]; - SCALE_HS_INIT(&su, col->width); - bufcat_su(h, "width", &su); - PAIR_STYLE_INIT(&tag, h); - print_otag(h, TAG_COL, 1, &tag); - } - - print_otag(h, TAG_TBODY, 0, NULL); + h->tblt = print_otag(h, TAG_TABLE, "c", "tbl"); } void @@ -89,14 +101,14 @@ print_tblclose(struct html *h) void print_tbl(struct html *h, const struct tbl_span *sp) { - const struct tbl_head *hp; - const struct tbl_dat *dp; - struct htmlpair tag; - struct tag *tt; + const struct tbl_dat *dp; + struct tag *tt; + const char *hspans, *vspans, *halign, *valign; + char hbuf[4], vbuf[4]; /* Inhibit printing of spaces: we do padding ourselves. */ - if (NULL == h->tblt) + if (h->tblt == NULL) html_tblopen(h, sp); assert(h->tblt); @@ -104,35 +116,83 @@ print_tbl(struct html *h, const struct tbl_span *sp) h->flags |= HTML_NONOSPACE; h->flags |= HTML_NOSPACE; - tt = print_otag(h, TAG_TR, 0, NULL); + tt = print_otag(h, TAG_TR, ""); switch (sp->pos) { - case (TBL_SPAN_HORIZ): - /* FALLTHROUGH */ - case (TBL_SPAN_DHORIZ): - PAIR_INIT(&tag, ATTR_COLSPAN, "0"); - print_otag(h, TAG_TD, 1, &tag); + case TBL_SPAN_HORIZ: + case TBL_SPAN_DHORIZ: + print_otag(h, TAG_TD, "?", "colspan", "0"); break; default: - dp = sp->first; - for (hp = sp->head; hp; hp = hp->next) { + for (dp = sp->first; dp != NULL; dp = dp->next) { print_stagq(h, tt); - print_otag(h, TAG_TD, 0, NULL); - switch (hp->pos) { - case (TBL_HEAD_VERT): - /* FALLTHROUGH */ - case (TBL_HEAD_DVERT): + /* + * Do not generate elements for continuations + * of spanned cells. Larger elements covering + * this space were already generated earlier. + */ + + if (dp->layout->pos == TBL_CELL_SPAN || + dp->layout->pos == TBL_CELL_DOWN || + (dp->string != NULL && + strcmp(dp->string, "\\^") == 0)) continue; - case (TBL_HEAD_DATA): - if (NULL == dp) - break; - if (TBL_CELL_DOWN != dp->layout->pos) - if (dp->string) - print_text(h, dp->string); - dp = dp->next; + + /* 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 (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; + + /* Print the element and the attributes. */ + + if (halign == NULL && valign == NULL) + print_otag(h, TAG_TD, "??", + "colspan", hspans, "rowspan", vspans); + else if (halign == NULL) + print_otag(h, TAG_TD, "??s", + "colspan", hspans, "rowspan", vspans, + "vertical-align", valign); + else if (valign == NULL) + print_otag(h, TAG_TD, "??s", + "colspan", hspans, "rowspan", vspans, + "text-align", halign); + else + 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); } break; } @@ -141,11 +201,10 @@ print_tbl(struct html *h, const struct tbl_span *sp) h->flags &= ~HTML_NONOSPACE; - if (TBL_SPAN_LAST & sp->flags) { + if (sp->next == NULL) { assert(h->tbl.cols); free(h->tbl.cols); h->tbl.cols = NULL; print_tblclose(h); } - }