Clarify what members may be NULL or not in calculating widths. Make

[mandoc.git] / tbl_layout.c

diff --git a/tbl_layout.c b/tbl_layout.c
index d0a9c617011380c6a193c6f116e5f0d421d1484f..b3e814670371428370426c25fb16b565e4f48d69 100644 (file)
--- a/tbl_layout.c
+++ b/tbl_layout.c
@@ -1,4 +1,4 @@
-/*     $Id: tbl_layout.c,v 1.7 2011/01/02 12:04:23 kristaps Exp $ */
+/*     $Id: tbl_layout.c,v 1.15 2011/01/10 15:31:00 kristaps Exp $ */
 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -29,6 +29,12 @@ struct       tbl_phrase {
        enum tbl_cellt   key;
 };
 
+/*
+ * FIXME: we can make this parse a lot nicer by, when an error is
+ * encountered in a layout key, bailing to the next key (i.e. to the
+ * next whitespace then continuing).
+ */
+
 #define        KEYS_MAX         11
 
 static const struct tbl_phrase keys[KEYS_MAX] = {
@@ -84,6 +90,20 @@ mod:
                break;
        }
 
+       /* Throw away parenthesised expression. */
+
+       if ('(' == p[*pos]) {
+               (*pos)++;
+               while (p[*pos] && ')' != p[*pos])
+                       (*pos)++;
+               if (')' == p[*pos]) {
+                       (*pos)++;
+                       goto mod;
+               }
+               TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos);
+               return(0);
+       }
+
        /* Parse numerical spacing from modifier string. */
 
        if (isdigit((unsigned char)p[*pos])) {
@@ -102,7 +122,7 @@ mod:
                }
 
                *pos += i;
-               cp->spacing = atoi(buf);
+               cp->spacing = (size_t)atoi(buf);
 
                goto mod;
                /* NOTREACHED */
@@ -110,7 +130,7 @@ mod:
 
        /* TODO: GNU has many more extensions. */
 
-       switch (tolower(p[(*pos)++])) {
+       switch (tolower((unsigned char)p[(*pos)++])) {
        case ('z'):
                cp->flags |= TBL_CELL_WIGN;
                goto mod;
@@ -126,6 +146,8 @@ mod:
        case ('d'):
                cp->flags |= TBL_CELL_BALIGN;
                goto mod;
+       case ('w'):  /* XXX for now, ignore minimal column width */
+               goto mod;
        case ('f'):
                break;
        case ('b'):
@@ -138,7 +160,7 @@ mod:
                return(0);
        }
 
-       switch (tolower(p[(*pos)++])) {
+       switch (tolower((unsigned char)p[(*pos)++])) {
        case ('b'):
                cp->flags |= TBL_CELL_BOLD;
                goto mod;
@@ -163,7 +185,7 @@ cell(struct tbl_node *tbl, struct tbl_row *rp,
        /* Parse the column position (`r', `R', `|', ...). */
 
        for (i = 0; i < KEYS_MAX; i++)
-               if (tolower(p[*pos]) == keys[i].name)
+               if (tolower((unsigned char)p[*pos]) == keys[i].name)
                        break;
 
        if (KEYS_MAX == i) {
@@ -171,9 +193,35 @@ cell(struct tbl_node *tbl, struct tbl_row *rp,
                return(0);
        }
 
-       (*pos)++;
        c = keys[i].key;
 
+       /*
+        * If a span cell is found first, raise a warning and abort the
+        * parse.  If a span cell is found and the last layout element
+        * isn't a "normal" layout, bail.
+        *
+        * FIXME: recover from this somehow?
+        */
+
+       if (TBL_CELL_SPAN == c) {
+               if (NULL == rp->first) {
+                       TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos);
+                       return(0);
+               } else if (rp->last)
+                       switch (rp->last->pos) {
+                       case (TBL_CELL_VERT):
+                       case (TBL_CELL_DVERT):
+                       case (TBL_CELL_HORIZ):
+                       case (TBL_CELL_DHORIZ):
+                               TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos);
+                               return(0);
+                       default:
+                               break;
+                       }
+       }
+
+       (*pos)++;
+
        /* Extra check for the double-vertical. */
 
        if (TBL_CELL_VERT == c && '|' == p[*pos]) {
@@ -294,7 +342,7 @@ cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, enum tbl_cellt pos)
         * ones.
         */
 
-       h = pp ? pp->head->prev : tbl->first_head;
+       h = pp ? pp->head->next : tbl->first_head;
 
        if (h) {
                /* Re-use data header. */
@@ -319,6 +367,7 @@ cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, enum tbl_cellt pos)
                                (TBL_CELL_VERT == p->pos ||
                                 TBL_CELL_DVERT == p->pos)) {
                        hp = mandoc_calloc(1, sizeof(struct tbl_head));
+                       hp->ident = tbl->opts.cols++;
                        hp->prev = h->prev;
                        if (h->prev)
                                h->prev->next = hp;
@@ -341,6 +390,7 @@ cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, enum tbl_cellt pos)
        }
 
        hp = mandoc_calloc(1, sizeof(struct tbl_head));
+       hp->ident = tbl->opts.cols++;
 
        if (tbl->last_head) {
                hp->prev = tbl->last_head;