diff options
| author |   schwarze <schwarze@openbsd.org> | 2018-11-24 23:03:13 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2018-11-24 23:03:13 +0000 |
| commit | 6bcc7ca88fd04cefea49df12e0ec03d0f6eb0cad (patch) | |
| tree | 07e8b1723500698cda92b04a5503f3a1eb58b53d | |
| parent | only attach pvclock(4) inside a KVM guest (diff) | |
| download | wireguard-openbsd-6bcc7ca88fd04cefea49df12e0ec03d0f6eb0cad.tar.xz wireguard-openbsd-6bcc7ca88fd04cefea49df12e0ec03d0f6eb0cad.zip | |
Implement horizontal and vertical alignment of tbl(7) cell content
in -T html output. This does not handle spanned cells yet.
Missing feature reported by Pali dot Rohar at gmail dot com.
| -rw-r--r-- | usr.bin/mandoc/mandoc.css | 4 | ||||
| -rw-r--r-- | usr.bin/mandoc/tbl_html.c | 42 |
2 files changed, 38 insertions, 8 deletions
diff --git a/usr.bin/mandoc/mandoc.css b/usr.bin/mandoc/mandoc.css index a704b6bbaf8..29c1adbd01a 100644 --- a/usr.bin/mandoc/mandoc.css +++ b/usr.bin/mandoc/mandoc.css @@ -1,4 +1,4 @@ -/* $OpenBSD: mandoc.css,v 1.24 2018/08/27 23:12:57 schwarze Exp $ */ +/* $OpenBSD: mandoc.css,v 1.25 2018/11/24 23:03:13 schwarze Exp $ */ /* * Standard style sheet for mandoc(1) -Thtml and man.cgi(8). */ @@ -9,7 +9,7 @@ html { max-width: 65em; } body { font-family: Helvetica,Arial,sans-serif; } table { margin-top: 0em; margin-bottom: 0em; } -td { vertical-align: top; } +td { vertical-align: middle; } ul, ol, dl { margin-top: 0em; margin-bottom: 0em; } li, dt { margin-top: 1em; } diff --git a/usr.bin/mandoc/tbl_html.c b/usr.bin/mandoc/tbl_html.c index 64679ec8f80..d317c78af00 100644 --- a/usr.bin/mandoc/tbl_html.c +++ b/usr.bin/mandoc/tbl_html.c @@ -1,7 +1,7 @@ -/* $OpenBSD: tbl_html.c,v 1.19 2018/06/25 13:46:01 schwarze Exp $ */ +/* $OpenBSD: tbl_html.c,v 1.20 2018/11/24 23:03:13 schwarze Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv> - * Copyright (c) 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org> + * Copyright (c) 2014, 2015, 2017, 2018 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 @@ -101,6 +101,7 @@ print_tbl(struct html *h, const struct tbl_span *sp) { const struct tbl_dat *dp; struct tag *tt; + const char *halign, *valign; int ic; /* Inhibit printing of spaces: we do padding ourselves. */ @@ -124,10 +125,40 @@ print_tbl(struct html *h, const struct tbl_span *sp) dp = sp->first; for (ic = 0; ic < sp->opts->cols; ic++) { print_stagq(h, tt); - print_otag(h, TAG_TD, ""); - - if (dp == NULL || dp->layout->col > ic) + if (dp == NULL || dp->layout->col > ic) { + print_otag(h, TAG_TD, ""); continue; + } + 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; + if (halign == NULL && valign == NULL) + print_otag(h, TAG_TD, ""); + else if (halign == NULL) + print_otag(h, TAG_TD, "s", + "vertical-align", valign); + else if (valign == NULL) + print_otag(h, TAG_TD, "s", + "text-align", halign); + else + print_otag(h, TAG_TD, "ss", + "vertical-align", valign, + "text-align", halign); if (dp->layout->pos != TBL_CELL_DOWN) if (dp->string != NULL) print_text(h, dp->string); @@ -146,5 +177,4 @@ print_tbl(struct html *h, const struct tbl_span *sp) h->tbl.cols = NULL; print_tblclose(h); } - } |