Grrr, patch(1) merged the new function to the wrong place in this file.

[mandoc.git] / tbl.c

diff --git a/tbl.c b/tbl.c
index 878c394cfdd514bb6f57a0ebf7084cda124a534f..bfed242b9d9e231a732a0ecdc3bafcc9e4087d7a 100644 (file)
--- a/tbl.c
+++ b/tbl.c
@@ -1,6 +1,7 @@
-/*     $Id: tbl.c,v 1.16 2011/01/01 23:00:46 kristaps Exp $ */
+/*     $Id: tbl.c,v 1.30 2014/08/10 23:54:41 schwarze 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -14,6 +15,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.
  */

+#include "config.h"
+
+#include <sys/types.h>
+

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


@@ -21,18 +26,13 @@
 #include <time.h>
 
 #include "mandoc.h"
 #include <time.h>
 
 #include "mandoc.h"

-#include "roff.h"
+#include "mandoc_aux.h"

 #include "libmandoc.h"
 #include "libroff.h"
 
 #include "libmandoc.h"
 #include "libroff.h"
 

-static void     tbl_calc(struct tbl *);
-static void     tbl_calc_data(struct tbl *, struct tbl_dat *);
-static void     tbl_calc_data_literal(struct tbl_dat *);
-static void     tbl_calc_data_number(struct tbl *, struct tbl_dat *);
-static void     tbl_calc_data_spanner(struct tbl_dat *);

 
 enum rofferr
 
 enum rofferr

-tbl_read(struct tbl *tbl, int ln, const char *p, int offs)
+tbl_read(struct tbl_node *tbl, int ln, const char *p, int offs)

 {
        int              len;
        const char      *cp;
 {
        int              len;
        const char      *cp;


@@ -54,11 +54,13 @@ tbl_read(struct tbl *tbl, int ln, const char *p, int offs)
        /* Now process each logical section of the table.  */
 
        switch (tbl->part) {
        /* Now process each logical section of the table.  */
 
        switch (tbl->part) {

-       case (TBL_PART_OPTS):
+       case TBL_PART_OPTS:

                return(tbl_option(tbl, ln, p) ? ROFF_IGN : ROFF_ERR);
                return(tbl_option(tbl, ln, p) ? ROFF_IGN : ROFF_ERR);

-       case (TBL_PART_LAYOUT):
+       case TBL_PART_LAYOUT:

                return(tbl_layout(tbl, ln, p) ? ROFF_IGN : ROFF_ERR);
                return(tbl_layout(tbl, ln, p) ? ROFF_IGN : ROFF_ERR);

-       case (TBL_PART_DATA):
+       case TBL_PART_CDATA:
+               return(tbl_cdata(tbl, ln, p) ? ROFF_TBL : ROFF_IGN);
+       default:

                break;
        }
 
                break;
        }
 


@@ -69,25 +71,24 @@ tbl_read(struct tbl *tbl, int ln, const char *p, int offs)
        return(tbl_data(tbl, ln, p) ? ROFF_TBL : ROFF_IGN);
 }
 
        return(tbl_data(tbl, ln, p) ? ROFF_TBL : ROFF_IGN);
 }
 

-struct tbl *
-tbl_alloc(int pos, int line, void *data, const mandocmsg msg)
+struct tbl_node *
+tbl_alloc(int pos, int line, struct mparse *parse)

 {
 {

-       struct tbl      *p;
+       struct tbl_node *tbl;

 
 

-       p = mandoc_calloc(1, sizeof(struct tbl));
-       p->line = line;
-       p->pos = pos;
-       p->data = data;
-       p->msg = msg;
-       p->part = TBL_PART_OPTS;
-       p->tab = '\t';
-       p->linesize = 12;
-       p->decimal = '.';
-       return(p);
+       tbl = mandoc_calloc(1, sizeof(struct tbl_node));
+       tbl->line = line;
+       tbl->pos = pos;
+       tbl->parse = parse;
+       tbl->part = TBL_PART_OPTS;
+       tbl->opts.tab = '\t';
+       tbl->opts.linesize = 12;
+       tbl->opts.decimal = '.';
+       return(tbl);

 }
 
 void
 }
 
 void

-tbl_free(struct tbl *p)
+tbl_free(struct tbl_node *tbl)

 {
        struct tbl_row  *rp;
        struct tbl_cell *cp;
 {
        struct tbl_row  *rp;
        struct tbl_cell *cp;


@@ -95,8 +96,8 @@ tbl_free(struct tbl *p)
        struct tbl_dat  *dp;
        struct tbl_head *hp;
 
        struct tbl_dat  *dp;
        struct tbl_head *hp;
 

-       while (NULL != (rp = p->first_row)) {
-               p->first_row = rp->next;
+       while (NULL != (rp = tbl->first_row)) {
+               tbl->first_row = rp->next;

                while (rp->first) {
                        cp = rp->first;
                        rp->first = cp->next;
                while (rp->first) {
                        cp = rp->first;
                        rp->first = cp->next;


@@ -105,8 +106,8 @@ tbl_free(struct tbl *p)
                free(rp);
        }
 
                free(rp);
        }
 

-       while (NULL != (sp = p->first_span)) {
-               p->first_span = sp->next;
+       while (NULL != (sp = tbl->first_span)) {
+               tbl->first_span = sp->next;

                while (sp->first) {
                        dp = sp->first;
                        sp->first = dp->next;
                while (sp->first) {
                        dp = sp->first;
                        sp->first = dp->next;


@@ -117,198 +118,59 @@ tbl_free(struct tbl *p)
                free(sp);
        }
 
                free(sp);
        }
 

-       while (NULL != (hp = p->first_head)) {
-               p->first_head = hp->next;
+       while (NULL != (hp = tbl->first_head)) {
+               tbl->first_head = hp->next;

                free(hp);
        }
 
                free(hp);
        }
 

-       free(p);
+       free(tbl);

 }
 
 void
 }
 
 void

-tbl_restart(int line, int pos, struct tbl *tbl)
+tbl_restart(int line, int pos, struct tbl_node *tbl)

 {
 {

+       if (TBL_PART_CDATA == tbl->part)
+               mandoc_msg(MANDOCERR_TBLBLOCK, tbl->parse,
+                   tbl->line, tbl->pos, NULL);

 
        tbl->part = TBL_PART_LAYOUT;
        tbl->line = line;
        tbl->pos = pos;
 
        if (NULL == tbl->first_span || NULL == tbl->first_span->first)
 
        tbl->part = TBL_PART_LAYOUT;
        tbl->line = line;
        tbl->pos = pos;
 
        if (NULL == tbl->first_span || NULL == tbl->first_span->first)

-               TBL_MSG(tbl, MANDOCERR_TBLNODATA, tbl->line, tbl->pos);
+               mandoc_msg(MANDOCERR_TBLNODATA, tbl->parse,
+                   tbl->line, tbl->pos, NULL);

 }
 
 const struct tbl_span *
 }
 
 const struct tbl_span *

-tbl_span(const struct tbl *tbl)
+tbl_span(struct tbl_node *tbl)

 {
 {

+       struct tbl_span  *span;

 
        assert(tbl);
 
        assert(tbl);

-       return(tbl->last_span);
+       span = tbl->current_span ? tbl->current_span->next
+                                : tbl->first_span;
+       if (span)
+               tbl->current_span = span;
+       return(span);

 }
 
 void
 }
 
 void

-tbl_end(struct tbl *tbl)
-{
-
-       if (NULL == tbl->first_span || NULL == tbl->first_span->first)
-               TBL_MSG(tbl, MANDOCERR_TBLNODATA, tbl->line, tbl->pos);
-       else
-               tbl_calc(tbl);
-}
-
-static void
-tbl_calc(struct tbl *tbl)
+tbl_end(struct tbl_node **tblp)

 {
 {

-       struct tbl_span *sp;
-       struct tbl_dat  *dp;
-       struct tbl_head *hp;
-
-       /* Calculate width as the max of column cells' widths. */
+       struct tbl_node *tbl;

 
 

-       for (sp = tbl->first_span; sp; sp = sp->next) {
-               switch (sp->pos) {
-               case (TBL_DATA_HORIZ):
-                       /* FALLTHROUGH */
-               case (TBL_DATA_DHORIZ):
-                       continue;
-               default:
-                       break;
-               }
-               for (dp = sp->first; dp; dp = dp->next)
-                       tbl_calc_data(tbl, dp);
-       }
+       tbl = *tblp;
+       *tblp = NULL;

 
 

-       /* Calculate width as the simple spanner value. */
-
-       for (hp = tbl->first_head; hp; hp = hp->next) 
-               switch (hp->pos) {
-               case (TBL_HEAD_VERT):
-                       hp->width = 1;
-                       break;
-               case (TBL_HEAD_DVERT):
-                       hp->width = 2;
-                       break;
-               default:
-                       break;
-               }
-}
-
-static void
-tbl_calc_data(struct tbl *tbl, struct tbl_dat *data)
-{
-
-       /*
-        * This is the case with overrunning cells... 
-        */
-       if (NULL == data->layout)
-               return;
-
-       /* Branch down into data sub-types. */
-
-       switch (data->layout->pos) {
-       case (TBL_CELL_HORIZ):
-               /* FALLTHROUGH */
-       case (TBL_CELL_DHORIZ):
-               tbl_calc_data_spanner(data);
-               break;
-       case (TBL_CELL_LONG):
-               /* FALLTHROUGH */
-       case (TBL_CELL_CENTRE):
-               /* FALLTHROUGH */
-       case (TBL_CELL_LEFT):
-               /* FALLTHROUGH */
-       case (TBL_CELL_RIGHT):
-               tbl_calc_data_literal(data);
-               break;
-       case (TBL_CELL_NUMBER):
-               tbl_calc_data_number(tbl, data);
-               break;
-       default:
-               abort();
-               /* NOTREACHED */
-       }
-}
-
-static void
-tbl_calc_data_spanner(struct tbl_dat *data)
-{
-
-       /* N.B., these are horiz spanners (not vert) so always 1. */
-       data->layout->head->width = 1;
-}
-
-static void
-tbl_calc_data_number(struct tbl *tbl, struct tbl_dat *data)
-{
-       int              sz, d;
-       char            *dp, pnt;
-
-       /*
-        * First calculate number width and decimal place (last + 1 for
-        * no-decimal numbers).  If the stored decimal is subsequent
-        * ours, make our size longer by that difference
-        * (right-"shifting"); similarly, if ours is subsequent the
-        * stored, then extend the stored size by the difference.
-        * Finally, re-assign the stored values.
-        */
-
-       /* TODO: use spacing modifier. */
-
-       assert(data->string);
-       sz = (int)strlen(data->string);
-       pnt = tbl->decimal;
-
-       if (NULL == (dp = strchr(data->string, pnt)))
-               d = sz + 1;
-       else
-               d = (int)(dp - data->string) + 1;
-
-       sz += 2;
-
-       if (data->layout->head->decimal > d) {
-               sz += data->layout->head->decimal - d;
-               d = data->layout->head->decimal;
-       } else
-               data->layout->head->width += 
-                       d - data->layout->head->decimal;
-
-       if (sz > data->layout->head->width)
-               data->layout->head->width = sz;
-       if (d > data->layout->head->decimal)
-               data->layout->head->decimal = d;
-}
-
-static void
-tbl_calc_data_literal(struct tbl_dat *data)
-{
-       int              sz, bufsz;
-
-       /* 
-        * Calculate our width and use the spacing, with a minimum
-        * spacing dictated by position (centre, e.g,. gets a space on
-        * either side, while right/left get a single adjacent space).
-        */
-
-       assert(data->string);
-       sz = (int)strlen(data->string);
-
-       switch (data->layout->pos) {
-       case (TBL_CELL_LONG):
-               /* FALLTHROUGH */
-       case (TBL_CELL_CENTRE):
-               bufsz = 2;
-               break;
-       default:
-               bufsz = 1;
-               break;
-       }
+       if (NULL == tbl->first_span || NULL == tbl->first_span->first)
+               mandoc_msg(MANDOCERR_TBLNODATA, tbl->parse,
+                   tbl->line, tbl->pos, NULL);

 
 

-       if (data->layout->spacing)
-               bufsz = bufsz > data->layout->spacing ? 
-                       bufsz : data->layout->spacing;
+       if (tbl->last_span)
+               tbl->last_span->flags |= TBL_SPAN_LAST;

 
 

-       sz += bufsz;
-       if (data->layout->head->width < sz)
-               data->layout->head->width = sz;
+       if (TBL_PART_CDATA == tbl->part)
+               mandoc_msg(MANDOCERR_TBLBLOCK, tbl->parse,
+                   tbl->line, tbl->pos, NULL);

 }
 }

-
-