diff options
Diffstat (limited to 'tbl_html.c')
| -rw-r--r-- | tbl_html.c | 42 |
1 files changed, 39 insertions, 3 deletions
diff --git a/tbl_html.c b/tbl_html.c index e137757dc16c..65c8ae8f887c 100644 --- a/tbl_html.c +++ b/tbl_html.c @@ -1,7 +1,7 @@ -/* $Id: tbl_html.c,v 1.33 2019/03/17 18:21:45 schwarze Exp $ */ +/* $Id: tbl_html.c,v 1.38 2021/09/09 16:52:52 schwarze Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv> - * Copyright (c) 2014, 2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org> + * Copyright (c) 2014,2015,2017,2018,2021 Ingo Schwarze <schwarze@openbsd.org> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -115,10 +115,14 @@ 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; + const struct roffcol *col; struct tag *tt; const char *hspans, *vspans, *halign, *valign; const char *bborder, *lborder, *rborder; + const char *ccp; char hbuf[4], vbuf[4]; + size_t sz; + enum mandoc_esc save_font; int i; if (h->tblt == NULL) @@ -240,8 +244,40 @@ print_tbl(struct html *h, const struct tbl_span *sp) "vertical-align", valign, "text-align", halign, "border-right-style", rborder); - if (dp->string != NULL) + if (dp->layout->pos == TBL_CELL_HORIZ || + dp->layout->pos == TBL_CELL_DHORIZ || + dp->pos == TBL_DATA_HORIZ || + dp->pos == TBL_DATA_DHORIZ) + print_otag(h, TAG_HR, ""); + else if (dp->string != NULL) { + save_font = h->metac; + html_setfont(h, dp->layout->font); + if (dp->layout->pos == TBL_CELL_LONG) + print_text(h, "\\[u2003]"); /* em space */ print_text(h, dp->string); + if (dp->layout->pos == TBL_CELL_NUMBER) { + col = h->tbl.cols + dp->layout->col; + if (col->decimal < col->nwidth) { + if ((ccp = strrchr(dp->string, + sp->opts->decimal)) == NULL) { + /* Punctuation space. */ + print_text(h, "\\[u2008]"); + ccp = strchr(dp->string, '\0'); + } else + ccp++; + sz = col->nwidth - col->decimal; + while (--sz > 0) { + if (*ccp == '\0') + /* Figure space. */ + print_text(h, + "\\[u2007]"); + else + ccp++; + } + } + } + html_setfont(h, save_font); + } } print_tagq(h, tt); |