From 9a942b0d761cb1d28c369ba2eee07297a956abd0 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Mon, 26 Nov 2018 01:51:46 +0000 Subject: Simplify writing of tbl(7) cells by using the new feature of passing a NULL pointer for the value of a style attribute, in which case the attribute is omitted from the HTML element. Minus 12 lines of ugly and repetitive code, no functional change. --- tbl_html.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) (limited to 'tbl_html.c') diff --git a/tbl_html.c b/tbl_html.c index 4523036c..de521834 100644 --- a/tbl_html.c +++ b/tbl_html.c @@ -1,4 +1,4 @@ -/* $Id: tbl_html.c,v 1.27 2018/11/25 21:17:34 schwarze Exp $ */ +/* $Id: tbl_html.c,v 1.28 2018/11/26 01:51:46 schwarze Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons * Copyright (c) 2014, 2015, 2017, 2018 Ingo Schwarze @@ -175,22 +175,10 @@ print_tbl(struct html *h, const struct tbl_span *sp) /* 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); + 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); } -- cgit v1.2.3