do not crash when a manpath directory contains a symbolic link

[mandoc.git] / tbl_html.c

diff --git a/tbl_html.c b/tbl_html.c
index e137757dc16c4d1b6765ee617ba5efe7e0c420cf..ce03c6ac7f2c2075ea2ec4d6ec35d1a2d0a54e3f 100644 (file)
--- a/tbl_html.c
+++ b/tbl_html.c
@@ -1,7 +1,7 @@
-/*     $Id: tbl_html.c,v 1.33 2019/03/17 18:21:45 schwarze Exp $ */
+/*     $Id: tbl_html.c,v 1.36 2021/08/10 12:55:04 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
@@ -119,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)
@@ -240,8 +241,14 @@ 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;
+                       html_setfont(h, dp->layout->font);
+                       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);