From 34102cbac76cbfcf5c22ad5d53cdd5364a1726df Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Sat, 24 Nov 2018 23:03:18 +0000 Subject: [PATCH] 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. --- TODO | 6 +----- mandoc.css | 4 ++-- tbl_html.c | 42 ++++++++++++++++++++++++++++++++++++------ 3 files changed, 39 insertions(+), 13 deletions(-) diff --git a/TODO b/TODO index 1bd006dd..52698ea0 100644 --- a/TODO +++ b/TODO @@ -1,6 +1,6 @@ ************************************************************************ * Official mandoc TODO. -* $Id: TODO,v 1.274 2018/10/25 21:23:52 schwarze Exp $ +* $Id: TODO,v 1.275 2018/11/24 23:03:18 schwarze Exp $ ************************************************************************ Many issues are annotated for difficulty as follows: @@ -195,10 +195,6 @@ are mere guesses, and some may be wrong. suggested by bentley@ Tue, 14 Oct 2014 04:10:55 -0600 loc * exist ** algo * size * imp ** -- implement horizontal and vertical alignment in HTML output - pali dot rohar at gmail dot com 16 Jul 2018 13:03:35 +0200 - loc * exist * algo * size * imp *** - - implement cell spanning in HTML output pali dot rohar at gmail dot com 16 Jul 2018 13:03:35 +0200 loc * exist * algo ** size ** imp ** diff --git a/mandoc.css b/mandoc.css index a8f50769..a32d92e2 100644 --- a/mandoc.css +++ b/mandoc.css @@ -1,4 +1,4 @@ -/* $Id: mandoc.css,v 1.37 2018/08/27 23:13:44 schwarze Exp $ */ +/* $Id: mandoc.css,v 1.38 2018/11/24 23:03:18 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/tbl_html.c b/tbl_html.c index b87804fd..1080ffdf 100644 --- a/tbl_html.c +++ b/tbl_html.c @@ -1,7 +1,7 @@ -/* $Id: tbl_html.c,v 1.24 2018/06/25 13:45:57 schwarze Exp $ */ +/* $Id: tbl_html.c,v 1.25 2018/11/24 23:03:18 schwarze Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons - * Copyright (c) 2014, 2015, 2017 Ingo Schwarze + * 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 @@ -103,6 +103,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. */ @@ -126,10 +127,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); @@ -148,5 +179,4 @@ print_tbl(struct html *h, const struct tbl_span *sp) h->tbl.cols = NULL; print_tblclose(h); } - } -- 2.47.1