In tbl layouts, we puked if a space didn't followed a vertical bar

[mandoc.git] / tbl_layout.c

diff --git a/tbl_layout.c b/tbl_layout.c
index c5686c047e92faec9a25db28176e1423d47e85c8..0aa18dcbebf1ee46a5d72d54f37e8cf9b011db9d 100644 (file)
--- a/tbl_layout.c
+++ b/tbl_layout.c
@@ -1,4 +1,4 @@
-/*     $Id: tbl_layout.c,v 1.11 2011/01/07 13:03:48 kristaps Exp $ */
+/*     $Id: tbl_layout.c,v 1.20 2011/05/17 13:11:40 kristaps Exp $ */

 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *


@@ -14,6 +14,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+

 #include <assert.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <ctype.h>
 #include <stdlib.h>


@@ -68,6 +72,23 @@ mods(struct tbl_node *tbl, struct tbl_cell *cp,
        char             buf[5];
        int              i;
 
        char             buf[5];
        int              i;
 

+       /* Not all types accept modifiers. */
+
+       switch (cp->pos) {
+       case (TBL_CELL_DOWN):
+               /* FALLTHROUGH */
+       case (TBL_CELL_HORIZ):
+               /* FALLTHROUGH */
+       case (TBL_CELL_DHORIZ):
+               /* FALLTHROUGH */
+       case (TBL_CELL_VERT):
+               /* FALLTHROUGH */
+       case (TBL_CELL_DVERT):
+               return(1);
+       default:
+               break;
+       }
+

 mod:
        /* 
         * XXX: since, at least for now, modifiers are non-conflicting
 mod:
        /* 
         * XXX: since, at least for now, modifiers are non-conflicting


@@ -90,6 +111,21 @@ mod:
                break;
        }
 
                break;
        }
 

+       /* Throw away parenthesised expression. */
+
+       if ('(' == p[*pos]) {
+               (*pos)++;
+               while (p[*pos] && ')' != p[*pos])
+                       (*pos)++;
+               if (')' == p[*pos]) {
+                       (*pos)++;
+                       goto mod;
+               }
+               mandoc_msg(MANDOCERR_TBLLAYOUT, 
+                               tbl->parse, ln, *pos, NULL);
+               return(0);
+       }
+

        /* Parse numerical spacing from modifier string. */
 
        if (isdigit((unsigned char)p[*pos])) {
        /* Parse numerical spacing from modifier string. */
 
        if (isdigit((unsigned char)p[*pos])) {


@@ -103,12 +139,13 @@ mod:
                /* No greater than 4 digits. */
 
                if (4 == i) {
                /* No greater than 4 digits. */
 
                if (4 == i) {

-                       TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos);
+                       mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse,
+                                       ln, *pos, NULL);

                        return(0);
                }
 
                *pos += i;
                        return(0);
                }
 
                *pos += i;

-               cp->spacing = atoi(buf);
+               cp->spacing = (size_t)atoi(buf);

 
                goto mod;
                /* NOTREACHED */
 
                goto mod;
                /* NOTREACHED */


@@ -116,7 +153,7 @@ mod:
 
        /* TODO: GNU has many more extensions. */
 
 
        /* 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;
        case ('z'):
                cp->flags |= TBL_CELL_WIGN;
                goto mod;


@@ -142,11 +179,12 @@ mod:
                (*pos)--;
                break;
        default:
                (*pos)--;
                break;
        default:

-               TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos - 1);
+               mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse,
+                               ln, *pos - 1, NULL);

                return(0);
        }
 
                return(0);
        }
 

-       switch (tolower(p[(*pos)++])) {
+       switch (tolower((unsigned char)p[(*pos)++])) {

        case ('b'):
                cp->flags |= TBL_CELL_BOLD;
                goto mod;
        case ('b'):
                cp->flags |= TBL_CELL_BOLD;
                goto mod;


@@ -157,7 +195,8 @@ mod:
                break;
        }
 
                break;
        }
 

-       TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos - 1);
+       mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse,
+                       ln, *pos - 1, NULL);

        return(0);
 }
 
        return(0);
 }
 


@@ -171,11 +210,12 @@ cell(struct tbl_node *tbl, struct tbl_row *rp,
        /* Parse the column position (`r', `R', `|', ...). */
 
        for (i = 0; i < KEYS_MAX; i++)
        /* 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) {
                        break;
 
        if (KEYS_MAX == i) {

-               TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos);
+               mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, 
+                               ln, *pos, NULL);

                return(0);
        }
 
                return(0);
        }
 


@@ -183,11 +223,38 @@ cell(struct tbl_node *tbl, struct tbl_row *rp,
 
        /*
         * If a span cell is found first, raise a warning and abort the
 
        /*
         * If a span cell is found first, raise a warning and abort the

-        * parse.  FIXME: recover from this somehow?
+        * 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) {
+                       mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse,
+                                       ln, *pos, NULL);
+                       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):
+                               mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse,
+                                               ln, *pos, NULL);
+                               return(0);
+                       default:
+                               break;
+                       }
+       }
+
+       /*
+        * If a vertical spanner is found, we may not be in the first
+        * row.

         */
 
         */
 

-       if (NULL == rp->first && TBL_CELL_SPAN == c) {
-               TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos);
+       if (TBL_CELL_DOWN == c && rp == tbl->first_row) {
+               mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, ln, *pos, NULL);

                return(0);
        }
 
                return(0);
        }
 


@@ -205,7 +272,7 @@ cell(struct tbl_node *tbl, struct tbl_row *rp,
        if (rp->last && (TBL_CELL_VERT == c || TBL_CELL_DVERT == c) &&
                        (TBL_CELL_VERT == rp->last->pos || 
                         TBL_CELL_DVERT == rp->last->pos)) {
        if (rp->last && (TBL_CELL_VERT == c || TBL_CELL_DVERT == c) &&
                        (TBL_CELL_VERT == rp->last->pos || 
                         TBL_CELL_DVERT == rp->last->pos)) {

-               TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos - 1);
+               mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, ln, *pos - 1, NULL);

                return(0);
        }
 
                return(0);
        }
 


@@ -246,7 +313,8 @@ cell:
        if ('.' == p[*pos]) {
                tbl->part = TBL_PART_DATA;
                if (NULL == tbl->first_row) 
        if ('.' == p[*pos]) {
                tbl->part = TBL_PART_DATA;
                if (NULL == tbl->first_row) 

-                       TBL_MSG(tbl, MANDOCERR_TBLNOLAYOUT, ln, *pos);
+                       mandoc_msg(MANDOCERR_TBLNOLAYOUT, tbl->parse, 
+                                       ln, *pos, NULL);

                (*pos)++;
                return;
        }
                (*pos)++;
                return;
        }


@@ -376,19 +444,19 @@ cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, enum tbl_cellt pos)
 }
 
 static void
 }
 
 static void

-head_adjust(const struct tbl_cell *cell, struct tbl_head *head)
+head_adjust(const struct tbl_cell *cellp, struct tbl_head *head)

 {
 {

-       if (TBL_CELL_VERT != cell->pos &&
-                       TBL_CELL_DVERT != cell->pos) {
+       if (TBL_CELL_VERT != cellp->pos &&
+                       TBL_CELL_DVERT != cellp->pos) {

                head->pos = TBL_HEAD_DATA;
                return;
        }
 
                head->pos = TBL_HEAD_DATA;
                return;
        }
 

-       if (TBL_CELL_VERT == cell->pos)
+       if (TBL_CELL_VERT == cellp->pos)

                if (TBL_HEAD_DVERT != head->pos)
                        head->pos = TBL_HEAD_VERT;
 
                if (TBL_HEAD_DVERT != head->pos)
                        head->pos = TBL_HEAD_VERT;
 

-       if (TBL_CELL_DVERT == cell->pos)
+       if (TBL_CELL_DVERT == cellp->pos)

                head->pos = TBL_HEAD_DVERT;
 }
 
                head->pos = TBL_HEAD_DVERT;
 }