From: Ingo Schwarze <schwarze@usta.de>
To: Pali Rohar <pali.rohar@gmail.com>
Cc: discuss@mandoc.bsd.lv
Subject: Re: Broken tables in HTML output
Date: Sun, 25 Nov 2018 00:15:18 +0100 [thread overview]
Message-ID: <20181124231518.GE16061@athene.usta.de> (raw)
In-Reply-To: <20180716152919.GB85992@athene.usta.de>
Hi,
Ingo Schwarze wrote on Mon, Jul 16, 2018 at 05:29:19PM +0200:
> Pali Rohar wrote on Mon, Jul 16, 2018 at 01:03:35PM +0200:
>> It seems that mandoc is not able to format tables in HTML output
>> correctly. Output is rather ugly which makes it less readable.
I just implemented the first one of the many missing features you
reported. Please bear with me, as i said, getting this all done
will not happen quickly.
[...]
>> text is not aligned at all.
> I added an entry to the TODO file, priority is relatively high:
>
> - 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 ***
I think this is fixed by the commit below (not handling spanned
cells yet).
Yours,
Ingo
Log Message:
-----------
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.
Modified Files:
--------------
mandoc:
TODO
mandoc.css
tbl_html.c
Revision Data
-------------
Index: mandoc.css
===================================================================
RCS file: /home/cvs/mandoc/mandoc/mandoc.css,v
retrieving revision 1.37
retrieving revision 1.38
diff -Lmandoc.css -Lmandoc.css -u -p -r1.37 -r1.38
--- mandoc.css
+++ mandoc.css
@@ -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; }
Index: tbl_html.c
===================================================================
RCS file: /home/cvs/mandoc/mandoc/tbl_html.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -Ltbl_html.c -Ltbl_html.c -u -p -r1.24 -r1.25
--- tbl_html.c
+++ tbl_html.c
@@ -1,7 +1,7 @@
/* $Id$ */
/*
* 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
@@ -103,6 +103,7 @@ print_tbl(struct html *h, const struct t
{
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 t
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 t
h->tbl.cols = NULL;
print_tblclose(h);
}
-
}
Index: TODO
===================================================================
RCS file: /home/cvs/mandoc/mandoc/TODO,v
retrieving revision 1.274
retrieving revision 1.275
diff -LTODO -LTODO -u -p -r1.274 -r1.275
--- TODO
+++ TODO
@@ -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 **
--
To unsubscribe send an email to discuss+unsubscribe@mandoc.bsd.lv
next prev parent reply other threads:[~2018-11-24 23:15 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-16 11:03 Pali Rohár
2018-07-16 15:29 ` Ingo Schwarze
2018-07-16 16:36 ` Pali Rohár
2018-07-16 17:44 ` Ingo Schwarze
2018-11-24 23:15 ` Ingo Schwarze [this message]
2018-11-25 19:34 ` Ingo Schwarze
2018-11-25 21:25 ` Ingo Schwarze
2018-11-26 8:53 ` Pali Rohár
2018-11-26 21:27 ` Ingo Schwarze
2018-11-26 21:58 ` Pali Rohár
2018-11-26 22:01 ` Pali Rohár
2018-11-26 22:05 ` Pali Rohár
2018-12-01 17:20 ` Ingo Schwarze
2018-12-01 19:35 ` Pali Rohár
2018-12-03 20:46 ` Pali Rohár
2018-12-04 5:33 ` Ingo Schwarze
2018-12-03 22:01 ` Pali Rohár
2018-12-03 22:14 ` Ingo Schwarze
2018-12-03 22:20 ` Pali Rohár
2018-12-03 22:37 ` Ingo Schwarze
2018-12-04 16:44 ` Pali Rohár
2018-12-04 18:04 ` Ingo Schwarze
2019-01-21 9:39 ` Pali Rohár
2019-01-21 13:16 ` Ingo Schwarze
2018-11-29 2:15 ` Ingo Schwarze
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181124231518.GE16061@athene.usta.de \
--to=schwarze@usta.de \
--cc=discuss@mandoc.bsd.lv \
--cc=pali.rohar@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).