Simplify the code building lists of spans, no output change intended.

[mandoc.git] / tbl_html.c

diff --git a/tbl_html.c b/tbl_html.c
index 8b80e385ec89d4af1713ad02d0907604960cf6ce..65c8ae8f887cbf21eba0524ba8c7e5b5f8c503bf 100644 (file)
--- a/tbl_html.c
+++ b/tbl_html.c
@@ -1,4 +1,4 @@
-/*     $Id: tbl_html.c,v 1.34 2021/05/16 18:11:20 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) 2014,2015,2017,2018,2021 Ingo Schwarze <schwarze@openbsd.org>
@@ -115,10 +115,13 @@ 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 roffcol    *col;
        struct tag              *tt;
        const char              *hspans, *vspans, *halign, *valign;
        const char              *bborder, *lborder, *rborder;
+       const char              *ccp;
        char                     hbuf[4], vbuf[4];
+       size_t                   sz;
        enum mandoc_esc          save_font;
        int                      i;
 
@@ -241,13 +244,38 @@ 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->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;
-                       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);
+                       html_setfont(h, dp->layout->font);
+                       if (dp->layout->pos == TBL_CELL_LONG)
+                               print_text(h, "\\[u2003]");  /* em space */
                        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);
                }
        }