libmdoc.h no longer needs mdoc.h

[mandoc.git] / tbl_layout.c

diff --git a/tbl_layout.c b/tbl_layout.c
index 450ccaa00eeeac9763f6b55da5fc3a2603a397dd..0f7d5a79326717b7ec8ca09b1cb37d311cc4ebdf 100644 (file)
--- a/tbl_layout.c
+++ b/tbl_layout.c
@@ -1,7 +1,7 @@
-/*     $Id: tbl_layout.c,v 1.40 2015/10/06 18:32:20 schwarze Exp $ */
+/*     $Id: tbl_layout.c,v 1.46 2018/12/13 02:06:07 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2012, 2014, 2015, 2017 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
@@ -20,14 +20,16 @@
 #include <sys/types.h>
 
 #include <ctype.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
-#include "mandoc.h"
 #include "mandoc_aux.h"
+#include "mandoc.h"
+#include "tbl.h"
 #include "libmandoc.h"
-#include "libroff.h"
+#include "tbl_int.h"
 
 struct tbl_phrase {
        char             name;
@@ -62,6 +64,7 @@ mods(struct tbl_node *tbl, struct tbl_cell *cp,
                int ln, const char *p, int *pos)
 {
        char            *endptr;
+       size_t           sz;
 
 mod:
        while (p[*pos] == ' ' || p[*pos] == '\t')
@@ -115,7 +118,6 @@ mod:
                    ln, *pos, "m");
                goto mod;
        case 'p':
-               /* FALLTHROUGH */
        case 'v':
                if (p[*pos] == '-' || p[*pos] == '+')
                        (*pos)++;
@@ -128,7 +130,22 @@ mod:
        case 'u':
                cp->flags |= TBL_CELL_UP;
                goto mod;
-       case 'w':  /* XXX for now, ignore minimal column width */
+       case 'w':
+               sz = 0;
+               if (p[*pos] == '(') {
+                       (*pos)++;
+                       while (p[*pos + sz] != '\0' && p[*pos + sz] != ')')
+                               sz++;
+               } else
+                       while (isdigit((unsigned char)p[*pos + sz]))
+                               sz++;
+               if (sz) {
+                       free(cp->wstr);
+                       cp->wstr = mandoc_strndup(p + *pos, sz);
+                       *pos += sz;
+                       if (p[*pos] == ')')
+                               (*pos)++;
+               }
                goto mod;
        case 'x':
                cp->flags |= TBL_CELL_WMAX;
@@ -168,17 +185,14 @@ mod:
 
        switch (p[(*pos)++]) {
        case '3':
-               /* FALLTHROUGH */
        case 'B':
                cp->flags |= TBL_CELL_BOLD;
                goto mod;
        case '2':
-               /* FALLTHROUGH */
        case 'I':
                cp->flags |= TBL_CELL_ITALIC;
                goto mod;
        case '1':
-               /* FALLTHROUGH */
        case 'R':
                goto mod;
        default:
@@ -286,6 +300,8 @@ tbl_layout(struct tbl_node *tbl, int ln, const char *p, int pos)
                                    tbl->parse, ln, pos, NULL);
                                cell_alloc(tbl, tbl->first_row,
                                    TBL_CELL_LEFT);
+                               if (tbl->opts.lvert < tbl->first_row->vert)
+                                       tbl->opts.lvert = tbl->first_row->vert;
                                return;
                        }
 
@@ -343,6 +359,7 @@ cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, enum tbl_cellt pos)
        struct tbl_cell *p, *pp;
 
        p = mandoc_calloc(1, sizeof(*p));
+       p->spacing = SIZE_MAX;
        p->pos = pos;
 
        if ((pp = rp->last) != NULL) {