From: schwarze <schwarze@openbsd.org>
Date: Sun, 16 May 2021 18:08:37 +0000 (+0000)
Subject: implement the tbl(7) layout modifiers "b" (bold) and "i" (italic)
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=07460cefea8e23b753b0317ad8db7bdf44cd29d6;p=openbsd

implement the tbl(7) layout modifiers "b" (bold) and "i" (italic)
in HTML output mode, similar to tbl_term.c, function tbl_word();
issue reported by Oliver dot Corff at email dot de
---

diff --git a/usr.bin/mandoc/html.c b/usr.bin/mandoc/html.c
index cadd57daec7..a922fe5e82b 100644
--- a/usr.bin/mandoc/html.c
+++ b/usr.bin/mandoc/html.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: html.c,v 1.142 2020/10/16 17:22:38 schwarze Exp $ */
+/* $OpenBSD: html.c,v 1.143 2021/05/16 18:08:37 schwarze Exp $ */
 /*
  * Copyright (c) 2011-2015, 2017-2020 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -138,6 +138,7 @@ html_alloc(const struct manoutput *outopts)
 	h = mandoc_calloc(1, sizeof(struct html));
 
 	h->tag = NULL;
+	h->metac = h->metal = ESCAPE_FONTROMAN;
 	h->style = outopts->style;
 	if ((h->base_man1 = outopts->man) == NULL)
 		h->base_man2 = NULL;
diff --git a/usr.bin/mandoc/tbl_html.c b/usr.bin/mandoc/tbl_html.c
index cbc4bfad65e..ab5a6b911cc 100644
--- a/usr.bin/mandoc/tbl_html.c
+++ b/usr.bin/mandoc/tbl_html.c
@@ -1,7 +1,7 @@
-/*	$OpenBSD: tbl_html.c,v 1.28 2019/03/17 18:20:07 schwarze Exp $ */
+/*	$OpenBSD: tbl_html.c,v 1.29 2021/05/16 18:08:37 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2014, 2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2014,2015,2017,2018,2021 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
@@ -117,6 +117,7 @@ print_tbl(struct html *h, const struct tbl_span *sp)
 	const char		*hspans, *vspans, *halign, *valign;
 	const char		*bborder, *lborder, *rborder;
 	char			 hbuf[4], vbuf[4];
+	enum mandoc_esc		 save_font;
 	int			 i;
 
 	if (h->tblt == NULL)
@@ -238,8 +239,15 @@ print_tbl(struct html *h, const struct tbl_span *sp)
 		    "vertical-align", valign,
 		    "text-align", halign,
 		    "border-right-style", rborder);
-		if (dp->string != NULL)
+		if (dp->string != NULL) {
+			save_font = h->metac;
+			if (dp->layout->flags & TBL_CELL_BOLD)
+				html_setfont(h, ESCAPE_FONTBOLD);
+			else if (dp->layout->flags & TBL_CELL_ITALIC)
+				html_setfont(h, ESCAPE_FONTITALIC);
 			print_text(h, dp->string);
+			html_setfont(h, save_font);
+		}
 	}
 
 	print_tagq(h, tt);