summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--usr.bin/mandoc/mandoc.css9
-rw-r--r--usr.bin/mandoc/tbl_html.c192
2 files changed, 130 insertions, 71 deletions
diff --git a/usr.bin/mandoc/mandoc.css b/usr.bin/mandoc/mandoc.css
index bc92234f5d9..089d4bc4bf7 100644
--- a/usr.bin/mandoc/mandoc.css
+++ b/usr.bin/mandoc/mandoc.css
@@ -1,4 +1,4 @@
-/* $OpenBSD: mandoc.css,v 1.26 2018/11/26 15:01:38 schwarze Exp $ */
+/* $OpenBSD: mandoc.css,v 1.27 2018/11/26 21:05:54 schwarze Exp $ */
/*
* Standard style sheet for mandoc(1) -Thtml and man.cgi(8).
*
@@ -13,8 +13,11 @@
html { max-width: 65em; }
body { font-family: Helvetica,Arial,sans-serif; }
table { margin-top: 0em;
- margin-bottom: 0em; }
-td { vertical-align: middle; }
+ margin-bottom: 0em;
+ border-collapse: collapse; }
+td { vertical-align: middle;
+ padding-left: 0.2em;
+ padding-right: 0.2em; }
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 6efc748f50c..be5f07bdcaa 100644
--- a/usr.bin/mandoc/tbl_html.c
+++ b/usr.bin/mandoc/tbl_html.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tbl_html.c,v 1.23 2018/11/26 01:51:41 schwarze Exp $ */
+/* $OpenBSD: tbl_html.c,v 1.24 2018/11/26 21:05:54 schwarze Exp $ */
/*
* Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2014, 2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -84,7 +84,15 @@ html_tblopen(struct html *h, const struct tbl_span *sp)
tblcalc(&h->tbl, sp, 0, 0);
}
assert(NULL == h->tblt);
- h->tblt = print_otag(h, TAG_TABLE, "c", "tbl");
+ h->tblt = print_otag(h, TAG_TABLE, "c?ss", "tbl",
+ "border",
+ sp->opts->opts & TBL_OPT_ALLBOX ? "1" : NULL,
+ "border-style",
+ sp->opts->opts & TBL_OPT_DBOX ? "double" :
+ sp->opts->opts & TBL_OPT_BOX ? "solid" : NULL,
+ "border-top-style",
+ sp->pos == TBL_SPAN_DHORIZ ? "double" :
+ sp->pos == TBL_SPAN_HORIZ ? "solid" : NULL);
}
void
@@ -100,89 +108,137 @@ void
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;
struct tag *tt;
const char *hspans, *vspans, *halign, *valign;
+ const char *bborder, *lborder, *rborder;
char hbuf[4], vbuf[4];
-
- /* Inhibit printing of spaces: we do padding ourselves. */
+ int i;
if (h->tblt == NULL)
html_tblopen(h, sp);
- assert(h->tblt);
+ /*
+ * Horizontal lines spanning the whole table
+ * are handled by previous or following table rows.
+ */
+
+ if (sp->pos != TBL_SPAN_DATA)
+ return;
+
+ /* Inhibit printing of spaces: we do padding ourselves. */
h->flags |= HTML_NONOSPACE;
h->flags |= HTML_NOSPACE;
- tt = print_otag(h, TAG_TR, "");
+ /* Draw a vertical line left of this row? */
- switch (sp->pos) {
- case TBL_SPAN_HORIZ:
- case TBL_SPAN_DHORIZ:
- print_otag(h, TAG_TD, "?", "colspan", "0");
+ switch (sp->layout->vert) {
+ case 2:
+ lborder = "double";
+ break;
+ case 1:
+ lborder = "solid";
break;
default:
- for (dp = sp->first; dp != NULL; dp = dp->next) {
- print_stagq(h, tt);
-
- /*
- * Do not generate <td> elements for continuations
- * of spanned cells. Larger <td> 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;
-
- /* 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. */
-
- 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);
- }
+ lborder = NULL;
break;
}
+ /* Draw a horizontal line below this row? */
+
+ bborder = NULL;
+ if ((psp = sp->next) != NULL) {
+ switch (psp->pos) {
+ case TBL_SPAN_DHORIZ:
+ bborder = "double";
+ break;
+ case TBL_SPAN_HORIZ:
+ bborder = "solid";
+ break;
+ default:
+ break;
+ }
+ }
+
+ tt = print_otag(h, TAG_TR, "ss",
+ "border-left-style", lborder,
+ "border-bottom-style", bborder);
+
+ for (dp = sp->first; dp != NULL; dp = dp->next) {
+ print_stagq(h, tt);
+
+ /*
+ * Do not generate <td> elements for continuations
+ * of spanned cells. Larger <td> elements covering
+ * this space were already generated earlier.
+ */
+
+ cp = dp->layout;
+ if (cp->pos == TBL_CELL_SPAN || cp->pos == TBL_CELL_DOWN ||
+ (dp->string != NULL && strcmp(dp->string, "\\^") == 0))
+ continue;
+
+ /* 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 (cp->pos) {
+ case TBL_CELL_CENTRE:
+ halign = "center";
+ break;
+ case TBL_CELL_RIGHT:
+ case TBL_CELL_NUMBER:
+ halign = "right";
+ break;
+ default:
+ halign = NULL;
+ break;
+ }
+ if (cp->flags & TBL_CELL_TALIGN)
+ valign = "top";
+ else if (cp->flags & TBL_CELL_BALIGN)
+ valign = "bottom";
+ else
+ valign = NULL;
+
+ for (i = dp->hspans; i > 0; i--)
+ cp = cp->next;
+ switch (cp->vert) {
+ case 2:
+ rborder = "double";
+ break;
+ case 1:
+ rborder = "solid";
+ break;
+ default:
+ rborder = NULL;
+ break;
+ }
+
+ /* Print the element and the attributes. */
+
+ print_otag(h, TAG_TD, "??sss",
+ "colspan", hspans, "rowspan", vspans,
+ "vertical-align", valign,
+ "text-align", halign,
+ "border-right-style", rborder);
+ if (dp->string != NULL)
+ print_text(h, dp->string);
+ }
+
print_tagq(h, tt);
h->flags &= ~HTML_NONOSPACE;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 02:18:02 +0000