version 1.24, 2018/06/25 13:45:57 |
version 1.27, 2018/11/25 21:17:34 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* 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 |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
Line 101 print_tblclose(struct html *h) |
|
Line 101 print_tblclose(struct html *h) |
|
void |
void |
print_tbl(struct html *h, const struct tbl_span *sp) |
print_tbl(struct html *h, const struct tbl_span *sp) |
{ |
{ |
const struct tbl_dat *dp; |
const struct tbl_dat *dp; |
struct tag *tt; |
struct tag *tt; |
int ic; |
const char *hspans, *vspans, *halign, *valign; |
|
char hbuf[4], vbuf[4]; |
|
|
/* Inhibit printing of spaces: we do padding ourselves. */ |
/* Inhibit printing of spaces: we do padding ourselves. */ |
|
|
Line 123 print_tbl(struct html *h, const struct tbl_span *sp) |
|
Line 124 print_tbl(struct html *h, const struct tbl_span *sp) |
|
print_otag(h, TAG_TD, "?", "colspan", "0"); |
print_otag(h, TAG_TD, "?", "colspan", "0"); |
break; |
break; |
default: |
default: |
dp = sp->first; |
for (dp = sp->first; dp != NULL; dp = dp->next) { |
for (ic = 0; ic < sp->opts->cols; ic++) { |
|
print_stagq(h, tt); |
print_stagq(h, tt); |
print_otag(h, TAG_TD, ""); |
|
|
|
if (dp == NULL || dp->layout->col > ic) |
/* |
|
* 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; |
continue; |
if (dp->layout->pos != TBL_CELL_DOWN) |
|
if (dp->string != NULL) |
/* Determine the attribute values. */ |
print_text(h, dp->string); |
|
dp = dp->next; |
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. */ |
|
|
|
if (halign == NULL && valign == NULL) |
|
print_otag(h, TAG_TD, "??", |
|
"colspan", hspans, "rowspan", vspans); |
|
else if (halign == NULL) |
|
print_otag(h, TAG_TD, "??s", |
|
"colspan", hspans, "rowspan", vspans, |
|
"vertical-align", valign); |
|
else if (valign == NULL) |
|
print_otag(h, TAG_TD, "??s", |
|
"colspan", hspans, "rowspan", vspans, |
|
"text-align", halign); |
|
else |
|
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); |
} |
} |
break; |
break; |
} |
} |
Line 148 print_tbl(struct html *h, const struct tbl_span *sp) |
|
Line 207 print_tbl(struct html *h, const struct tbl_span *sp) |
|
h->tbl.cols = NULL; |
h->tbl.cols = NULL; |
print_tblclose(h); |
print_tblclose(h); |
} |
} |
|
|
} |
} |