Merge man_args() into man_macro.c, the only place where it's called, and

[mandoc.git] / tbl_data.c

diff --git a/tbl_data.c b/tbl_data.c
index 980a584c5090d8af7f9d12514650fdfa2cf3fd30..129695d8bb96b0da97bc1d54643f5a3e0408ca1a 100644 (file)
--- a/tbl_data.c
+++ b/tbl_data.c
@@ -1,6 +1,7 @@
-/*     $Id: tbl_data.c,v 1.19 2011/01/11 14:12:01 kristaps Exp $ */
+/*     $Id: tbl_data.c,v 1.24 2011/03/20 16:02:05 kristaps Exp $ */
 /*
- * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2011 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
@@ -28,8 +29,10 @@
 #include "libmandoc.h"
 #include "libroff.h"
 
-static int     data(struct tbl_node *, struct tbl_span *, 
-                       int, const char *, int *);
+static int              data(struct tbl_node *, struct tbl_span *, 
+                               int, const char *, int *);
+static struct tbl_span *newspan(struct tbl_node *, int, 
+                               struct tbl_row *);
 
 static int
 data(struct tbl_node *tbl, struct tbl_span *dp, 
@@ -61,7 +64,8 @@ data(struct tbl_node *tbl, struct tbl_span *dp,
         */
 
        if (NULL == cp) {
-               TBL_MSG(tbl, MANDOCERR_TBLEXTRADAT, ln, *pos);
+               mandoc_msg(MANDOCERR_TBLEXTRADAT, 
+                               tbl->parse, ln, *pos, NULL);
                /* Skip to the end... */
                while (p[*pos])
                        (*pos)++;
@@ -103,8 +107,10 @@ data(struct tbl_node *tbl, struct tbl_span *dp,
                return(0);
        }
 
-       dat->string = mandoc_malloc(*pos - sv + 1);
-       memcpy(dat->string, &p[sv], *pos - sv);
+       assert(*pos - sv >= 0);
+
+       dat->string = mandoc_malloc((size_t)(*pos - sv + 1));
+       memcpy(dat->string, &p[sv], (size_t)(*pos - sv));
        dat->string[*pos - sv] = '\0';
 
        if (p[*pos])
@@ -125,7 +131,8 @@ data(struct tbl_node *tbl, struct tbl_span *dp,
                        TBL_CELL_DHORIZ == dat->layout->pos ||
                        TBL_CELL_DOWN == dat->layout->pos)
                if (TBL_DATA_DATA == dat->pos && '\0' != *dat->string)
-                       TBL_MSG(tbl, MANDOCERR_TBLIGNDATA, ln, sv);
+                       mandoc_msg(MANDOCERR_TBLIGNDATA, 
+                                       tbl->parse, ln, sv, NULL);
 
        return(1);
 }
@@ -167,11 +174,35 @@ tbl_cdata(struct tbl_node *tbl, int ln, const char *p)
                dat->string = mandoc_strdup(p);
 
        if (TBL_CELL_DOWN == dat->layout->pos) 
-               TBL_MSG(tbl, MANDOCERR_TBLIGNDATA, ln, pos);
+               mandoc_msg(MANDOCERR_TBLIGNDATA, 
+                               tbl->parse, ln, pos, NULL);
 
        return(0);
 }
 
+static struct tbl_span *
+newspan(struct tbl_node *tbl, int line, struct tbl_row *rp)
+{
+       struct tbl_span *dp;
+
+       dp = mandoc_calloc(1, sizeof(struct tbl_span));
+       dp->line = line;
+       dp->tbl = &tbl->opts;
+       dp->layout = rp;
+       dp->head = tbl->first_head;
+
+       if (tbl->last_span) {
+               tbl->last_span->next = dp;
+               tbl->last_span = dp;
+       } else {
+               tbl->last_span = tbl->first_span = dp;
+               tbl->current_span = NULL;
+               dp->flags |= TBL_SPAN_FIRST;
+       }
+
+       return(dp);
+}
+
 int
 tbl_data(struct tbl_node *tbl, int ln, const char *p)
 {
@@ -182,7 +213,7 @@ tbl_data(struct tbl_node *tbl, int ln, const char *p)
        pos = 0;
 
        if ('\0' == p[pos]) {
-               TBL_MSG(tbl, MANDOCERR_TBL, ln, pos);
+               mandoc_msg(MANDOCERR_TBL, tbl->parse, ln, pos, NULL);
                return(0);
        }
 
@@ -196,9 +227,24 @@ tbl_data(struct tbl_node *tbl, int ln, const char *p)
 
        if (tbl->last_span) {
                assert(tbl->last_span->layout);
-               if (tbl->last_span->pos == TBL_SPAN_DATA)
-                       rp = tbl->last_span->layout->next;
-               else
+               if (tbl->last_span->pos == TBL_SPAN_DATA) {
+                       for (rp = tbl->last_span->layout->next;
+                                       rp && rp->first; rp = rp->next) {
+                               switch (rp->first->pos) {
+                               case (TBL_CELL_HORIZ):
+                                       dp = newspan(tbl, ln, rp);
+                                       dp->pos = TBL_SPAN_HORIZ;
+                                       continue;
+                               case (TBL_CELL_DHORIZ):
+                                       dp = newspan(tbl, ln, rp);
+                                       dp->pos = TBL_SPAN_DHORIZ;
+                                       continue;
+                               default:
+                                       break;
+                               }
+                               break;
+                       }
+               } else
                        rp = tbl->last_span->layout;
 
                if (NULL == rp)
@@ -208,18 +254,7 @@ tbl_data(struct tbl_node *tbl, int ln, const char *p)
 
        assert(rp);
 
-       dp = mandoc_calloc(1, sizeof(struct tbl_span));
-       dp->tbl = &tbl->opts;
-       dp->layout = rp;
-       dp->head = tbl->first_head;
-
-       if (tbl->last_span) {
-               tbl->last_span->next = dp;
-               tbl->last_span = dp;
-       } else {
-               tbl->last_span = tbl->first_span = dp;
-               dp->flags |= TBL_SPAN_FIRST;
-       }
+       dp = newspan(tbl, ln, rp);
 
        if ( ! strcmp(p, "_")) {
                dp->pos = TBL_SPAN_HORIZ;