Clean up memory handling in spawn_pager(), free(3)ing everything

[mandoc.git] / tbl_html.c

diff --git a/tbl_html.c b/tbl_html.c
index 98c7b96c6e21e12505c91db3da2197812cf7a356..65c8ae8f887cbf21eba0524ba8c7e5b5f8c503bf 100644 (file)
--- a/tbl_html.c
+++ b/tbl_html.c
@@ -1,7 +1,7 @@
-/*     $Id: tbl_html.c,v 1.31 2018/12/16 00:17:02 schwarze Exp $ */
+/*     $Id: tbl_html.c,v 1.38 2021/09/09 16:52:52 schwarze Exp $ */

 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -25,6 +25,7 @@
 #include <string.h>
 
 #include "mandoc.h"
 #include <string.h>
 
 #include "mandoc.h"

+#include "roff.h"

 #include "tbl.h"
 #include "out.h"
 #include "html.h"
 #include "tbl.h"
 #include "out.h"
 #include "html.h"


@@ -80,6 +81,7 @@ html_tbl_sulen(const struct roffsu *su, void *arg)
 static void
 html_tblopen(struct html *h, const struct tbl_span *sp)
 {
 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;
        if (h->tbl.cols == NULL) {
                h->tbl.len = html_tbl_len;
                h->tbl.slen = html_tbl_strlen;


@@ -113,10 +115,14 @@ print_tbl(struct html *h, const struct tbl_span *sp)
        const struct tbl_dat    *dp;
        const struct tbl_cell   *cp;
        const struct tbl_span   *psp;
        const struct tbl_dat    *dp;
        const struct tbl_cell   *cp;
        const struct tbl_span   *psp;

+       const struct roffcol    *col;

        struct tag              *tt;
        const char              *hspans, *vspans, *halign, *valign;
        const char              *bborder, *lborder, *rborder;
        struct tag              *tt;
        const char              *hspans, *vspans, *halign, *valign;
        const char              *bborder, *lborder, *rborder;

+       const char              *ccp;

        char                     hbuf[4], vbuf[4];
        char                     hbuf[4], vbuf[4];

+       size_t                   sz;
+       enum mandoc_esc          save_font;

        int                      i;
 
        if (h->tblt == NULL)
        int                      i;
 
        if (h->tblt == NULL)


@@ -238,8 +244,40 @@ print_tbl(struct html *h, const struct tbl_span *sp)
                    "vertical-align", valign,
                    "text-align", halign,
                    "border-right-style", rborder);
                    "vertical-align", valign,
                    "text-align", halign,
                    "border-right-style", rborder);

-               if (dp->string != NULL)
+               if (dp->layout->pos == TBL_CELL_HORIZ ||
+                   dp->layout->pos == TBL_CELL_DHORIZ ||
+                   dp->pos == TBL_DATA_HORIZ ||
+                   dp->pos == TBL_DATA_DHORIZ)
+                       print_otag(h, TAG_HR, "");
+               else 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);
                        print_text(h, dp->string);

+                       if (dp->layout->pos == TBL_CELL_NUMBER) {
+                               col = h->tbl.cols + dp->layout->col;
+                               if (col->decimal < col->nwidth) {
+                                       if ((ccp = strrchr(dp->string,
+                                           sp->opts->decimal)) == NULL) {
+                                               /* Punctuation space. */
+                                               print_text(h, "\\[u2008]");
+                                               ccp = strchr(dp->string, '\0');
+                                       } else
+                                               ccp++;
+                                       sz = col->nwidth - col->decimal;
+                                       while (--sz > 0) {
+                                               if (*ccp == '\0')
+                                                       /* Figure space. */
+                                                       print_text(h,
+                                                           "\\[u2007]");
+                                               else
+                                                       ccp++;
+                                       }
+                               }
+                       }
+                       html_setfont(h, save_font);
+               }

        }
 
        print_tagq(h, tt);
        }
 
        print_tagq(h, tt);