The name "struct tbl" was badly misleading for two reasons:

1) This struct almost exclusively contains the table options.
2) Information about the table as a whole is actually in "struct tbl_node".
Besides, "struct tbl" was almost impossible to search for.
So rename it to "struct tbl_opts".  No functional change.

diff --git a/libroff.h b/libroff.h
index 0bdd5a3604783afd47d5895dcd46b09738819258..5b84c5fc4541a1e432030c40ec304fc16c5c545d 100644 (file)
--- a/libroff.h
+++ b/libroff.h
@@ -1,4 +1,4 @@
-/*     $Id: libroff.h,v 1.27 2011/07/25 15:37:00 kristaps Exp $ */
+/*     $Id: libroff.h,v 1.28 2013/05/31 21:37:17 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -31,7 +31,7 @@ struct        tbl_node {
        int               pos; /* invocation column */
        int               line; /* invocation line */
        enum tbl_part     part;
-       struct tbl        opts;
+       struct tbl_opts   opts;
        struct tbl_row   *first_row;
        struct tbl_row   *last_row;
        struct tbl_span  *first_span;

diff --git a/mandoc.h b/mandoc.h
index f84b746cd4d4e81d4286912a9068ebac47cf3bd8..c86530c4f8f156f0638f33f6c772df3e55caf698 100644 (file)
--- a/mandoc.h
+++ b/mandoc.h
@@ -1,4 +1,4 @@
-/*     $Id: mandoc.h,v 1.106 2012/11/19 22:30:58 schwarze Exp $ */
+/*     $Id: mandoc.h,v 1.107 2013/05/31 21:37:17 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012 Ingo Schwarze <schwarze@openbsd.org>
@@ -164,7 +164,7 @@ enum        mandocerr {
        MANDOCERR_MAX
 };
 
-struct tbl {
+struct tbl_opts {
        char              tab; /* cell-separator */
        char              decimal; /* decimal point */
        int               linesize;
@@ -263,7 +263,7 @@ enum        tbl_spant {
  * A row of data in a table.
  */
 struct tbl_span {
-       struct tbl       *tbl;
+       struct tbl_opts  *opts;
        struct tbl_head  *head;
        struct tbl_row   *layout; /* layout row */
        struct tbl_dat   *first;

diff --git a/out.c b/out.c
index 6f41f3bccaab576973883b2790d340744678f833..1d8c8ab4b662b7684a8ba09a77c007d8f96ef050 100644 (file)
--- a/out.c
+++ b/out.c
@@ -1,4 +1,4 @@
-/*     $Id: out.c,v 1.44 2012/05/27 17:54:54 schwarze Exp $ */
+/*     $Id: out.c,v 1.45 2013/05/31 21:37:17 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -32,11 +32,11 @@
 #include "out.h"
 
 static void    tblcalc_data(struct rofftbl *, struct roffcol *,
-                       const struct tbl *, const struct tbl_dat *);
+                       const struct tbl_opts *, const struct tbl_dat *);
 static void    tblcalc_literal(struct rofftbl *, struct roffcol *,
                        const struct tbl_dat *);
 static void    tblcalc_number(struct rofftbl *, struct roffcol *,
-                       const struct tbl *, const struct tbl_dat *);
+                       const struct tbl_opts *, const struct tbl_dat *);
 
 /* 
  * Convert a `scaling unit' to a consistent form, or fail.  Scaling
@@ -154,7 +154,7 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp)
 
        assert(NULL == tbl->cols);
        tbl->cols = mandoc_calloc
-               ((size_t)sp->tbl->cols, sizeof(struct roffcol));
+               ((size_t)sp->opts->cols, sizeof(struct roffcol));
 
        hp = sp->head;
 
@@ -175,14 +175,14 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp)
                                continue;
                        assert(dp->layout);
                        col = &tbl->cols[dp->layout->head->ident];
-                       tblcalc_data(tbl, col, sp->tbl, dp);
+                       tblcalc_data(tbl, col, sp->opts, dp);
                }
        }
 }
 
 static void
 tblcalc_data(struct rofftbl *tbl, struct roffcol *col,
-               const struct tbl *tp, const struct tbl_dat *dp)
+               const struct tbl_opts *opts, const struct tbl_dat *dp)
 {
        size_t           sz;
 
@@ -206,7 +206,7 @@ tblcalc_data(struct rofftbl *tbl, struct roffcol *col,
                tblcalc_literal(tbl, col, dp);
                break;
        case (TBL_CELL_NUMBER):
-               tblcalc_number(tbl, col, tp, dp);
+               tblcalc_number(tbl, col, opts, dp);
                break;
        case (TBL_CELL_DOWN):
                break;
@@ -232,7 +232,7 @@ tblcalc_literal(struct rofftbl *tbl, struct roffcol *col,
 
 static void
 tblcalc_number(struct rofftbl *tbl, struct roffcol *col,
-               const struct tbl *tp, const struct tbl_dat *dp)
+               const struct tbl_opts *opts, const struct tbl_dat *dp)
 {
        int              i;
        size_t           sz, psz, ssz, d;
@@ -254,12 +254,12 @@ tblcalc_number(struct rofftbl *tbl, struct roffcol *col,
 
        /* FIXME: TBL_DATA_HORIZ et al.? */
 
-       buf[0] = tp->decimal;
+       buf[0] = opts->decimal;
        buf[1] = '\0';
 
        psz = (*tbl->slen)(buf, tbl->arg);
 
-       if (NULL != (cp = strrchr(str, tp->decimal))) {
+       if (NULL != (cp = strrchr(str, opts->decimal))) {
                buf[1] = '\0';
                for (ssz = 0, i = 0; cp != &str[i]; i++) {
                        buf[0] = str[i];

diff --git a/tbl_data.c b/tbl_data.c
index 3b4096487a9eb61f3f73dfd03c0d9940195a4873..9b48aa69759844a208ce59d59b68dafaf20a58fc 100644 (file)
--- a/tbl_data.c
+++ b/tbl_data.c
@@ -1,4 +1,4 @@
-/*     $Id: tbl_data.c,v 1.25 2012/05/27 17:54:54 schwarze Exp $ */
+/*     $Id: tbl_data.c,v 1.26 2013/05/31 21:37:17 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -185,7 +185,7 @@ newspan(struct tbl_node *tbl, int line, struct tbl_row *rp)
 
        dp = mandoc_calloc(1, sizeof(struct tbl_span));
        dp->line = line;
-       dp->tbl = &tbl->opts;
+       dp->opts = &tbl->opts;
        dp->layout = rp;
        dp->head = tbl->first_head;
 

diff --git a/tbl_term.c b/tbl_term.c
index 9f399d0cf96ba4aee0b3d65d6444cc4fa2f12586..e8411ffeceaa29294556c25fd96e05104e1d9ad5 100644 (file)
--- a/tbl_term.c
+++ b/tbl_term.c
@@ -1,4 +1,4 @@
-/*     $Id: tbl_term.c,v 1.24 2012/05/27 18:02:49 schwarze Exp $ */
+/*     $Id: tbl_term.c,v 1.25 2013/05/31 21:37:17 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012 Ingo Schwarze <schwarze@openbsd.org>
@@ -31,14 +31,14 @@
 static size_t  term_tbl_len(size_t, void *);
 static size_t  term_tbl_strlen(const char *, void *);
 static void    tbl_char(struct termp *, char, size_t);
-static void    tbl_data(struct termp *, const struct tbl *,
+static void    tbl_data(struct termp *, const struct tbl_opts *,
                        const struct tbl_dat *, 
                        const struct roffcol *);
 static size_t  tbl_rulewidth(struct termp *, const struct tbl_head *);
 static void    tbl_hframe(struct termp *, const struct tbl_span *, int);
 static void    tbl_literal(struct termp *, const struct tbl_dat *, 
                        const struct roffcol *);
-static void    tbl_number(struct termp *, const struct tbl *, 
+static void    tbl_number(struct termp *, const struct tbl_opts *, 
                        const struct tbl_dat *, 
                        const struct roffcol *);
 static void    tbl_hrule(struct termp *, const struct tbl_span *);
@@ -96,16 +96,16 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
        /* Horizontal frame at the start of boxed tables. */
 
        if (TBL_SPAN_FIRST & sp->flags) {
-               if (TBL_OPT_DBOX & sp->tbl->opts)
+               if (TBL_OPT_DBOX & sp->opts->opts)
                        tbl_hframe(tp, sp, 1);
-               if (TBL_OPT_DBOX & sp->tbl->opts ||
-                   TBL_OPT_BOX  & sp->tbl->opts)
+               if (TBL_OPT_DBOX & sp->opts->opts ||
+                   TBL_OPT_BOX  & sp->opts->opts)
                        tbl_hframe(tp, sp, 0);
        }
 
        /* Vertical frame at the start of each row. */
 
-       if (TBL_OPT_BOX & sp->tbl->opts || TBL_OPT_DBOX & sp->tbl->opts)
+       if (TBL_OPT_BOX & sp->opts->opts || TBL_OPT_DBOX & sp->opts->opts)
                term_word(tp, TBL_SPAN_HORIZ == sp->pos ||
                        TBL_SPAN_DHORIZ == sp->pos ? "+" : "|");
 
@@ -142,7 +142,7 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
                                tbl_vrule(tp, hp);
 
                        col = &tp->tbl.cols[hp->ident];
-                       tbl_data(tp, sp->tbl, dp, col);
+                       tbl_data(tp, sp->opts, dp, col);
 
                        /* 
                         * Go to the next data cell and assign the
@@ -159,7 +159,7 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
 
        /* Vertical frame at the end of each row. */
 
-       if (TBL_OPT_BOX & sp->tbl->opts || TBL_OPT_DBOX & sp->tbl->opts)
+       if (TBL_OPT_BOX & sp->opts->opts || TBL_OPT_DBOX & sp->opts->opts)
                term_word(tp, TBL_SPAN_HORIZ == sp->pos ||
                        TBL_SPAN_DHORIZ == sp->pos ? "+" : " |");
        term_flushln(tp);
@@ -170,12 +170,12 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
         */
 
        if (TBL_SPAN_LAST & sp->flags) {
-               if (TBL_OPT_DBOX & sp->tbl->opts ||
-                   TBL_OPT_BOX  & sp->tbl->opts) {
+               if (TBL_OPT_DBOX & sp->opts->opts ||
+                   TBL_OPT_BOX  & sp->opts->opts) {
                        tbl_hframe(tp, sp, 0);
                        tp->skipvsp = 1;
                }
-               if (TBL_OPT_DBOX & sp->tbl->opts) {
+               if (TBL_OPT_DBOX & sp->opts->opts) {
                        tbl_hframe(tp, sp, 1);
                        tp->skipvsp = 2;
                }
@@ -254,7 +254,7 @@ tbl_hframe(struct termp *tp, const struct tbl_span *sp, int outer)
 }
 
 static void
-tbl_data(struct termp *tp, const struct tbl *tbl,
+tbl_data(struct termp *tp, const struct tbl_opts *opts,
                const struct tbl_dat *dp, 
                const struct roffcol *col)
 {
@@ -300,7 +300,7 @@ tbl_data(struct termp *tp, const struct tbl *tbl,
                tbl_literal(tp, dp, col);
                break;
        case (TBL_CELL_NUMBER):
-               tbl_number(tp, tbl, dp, col);
+               tbl_number(tp, opts, dp, col);
                break;
        case (TBL_CELL_DOWN):
                tbl_char(tp, ASCII_NBRSP, col->width);
@@ -381,7 +381,7 @@ tbl_literal(struct termp *tp, const struct tbl_dat *dp,
 }
 
 static void
-tbl_number(struct termp *tp, const struct tbl *tbl,
+tbl_number(struct termp *tp, const struct tbl_opts *opts,
                const struct tbl_dat *dp,
                const struct roffcol *col)
 {
@@ -399,12 +399,12 @@ tbl_number(struct termp *tp, const struct tbl *tbl,
 
        sz = term_strlen(tp, dp->string);
 
-       buf[0] = tbl->decimal;
+       buf[0] = opts->decimal;
        buf[1] = '\0';
 
        psz = term_strlen(tp, buf);
 
-       if (NULL != (cp = strrchr(dp->string, tbl->decimal))) {
+       if (NULL != (cp = strrchr(dp->string, opts->decimal))) {
                buf[1] = '\0';
                for (ssz = 0, i = 0; cp != &dp->string[i]; i++) {
                        buf[0] = dp->string[i];