Rename the compile-time configuration variable $HOMEBREWDIR to

[mandoc.git] / tbl_html.c

diff --git a/tbl_html.c b/tbl_html.c
index d516be9eac8f85125e3f8e931cd0a3de36ad966a..6e500dc598bee27700e1b36ba4090c7799e39a4f 100644 (file)
--- a/tbl_html.c
+++ b/tbl_html.c
@@ -1,7 +1,7 @@
-/*     $Id: tbl_html.c,v 1.30 2018/12/12 21:54:35 schwarze Exp $ */
+/*     $Id: tbl_html.c,v 1.35 2021/05/16 23:18:35 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
@@ -24,6 +24,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "mandoc.h"
+#include "roff.h"
 #include "tbl.h"
 #include "out.h"
 #include "html.h"
@@ -79,6 +81,7 @@ html_tbl_sulen(const struct roffsu *su, void *arg)
 static void
 html_tblopen(struct html *h, const struct tbl_span *sp)
 {
+       html_close_paragraph(h);
        if (h->tbl.cols == NULL) {
                h->tbl.len = html_tbl_len;
                h->tbl.slen = html_tbl_strlen;
@@ -116,6 +119,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)
@@ -237,8 +241,17 @@ 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);
+                       if (dp->layout->pos == TBL_CELL_LONG)
+                               print_text(h, "\\[u2003]");  /* em space */
                        print_text(h, dp->string);
+                       html_setfont(h, save_font);
+               }
        }
 
        print_tagq(h, tt);