improve SQL style: avoid "SELECT *", be explicit in what columns we want;

[mandoc.git] / tbl_term.c

diff --git a/tbl_term.c b/tbl_term.c
index 644f6cecbd1bf3ed3092c4c011002b715de9f744..e52831ba7ee77bc65579c5d7dc645107eef30d35 100644 (file)
--- a/tbl_term.c
+++ b/tbl_term.c
@@ -1,7 +1,7 @@
-/*     $Id: tbl_term.c,v 1.22 2012/05/27 17:54:54 schwarze Exp $ */
+/*     $Id: tbl_term.c,v 1.27 2014/04/20 16:46:05 schwarze Exp $ */

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

- * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011, 2012, 2014 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


@@ -31,15 +31,15 @@
 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 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 *,
-                       const struct tbl_dat *, 
+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);
                        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 *, 
+static void    tbl_literal(struct termp *, const struct tbl_dat *,

                        const struct roffcol *);
                        const struct roffcol *);

-static void    tbl_number(struct termp *, const struct tbl *, 
-                       const struct tbl_dat *, 
+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 *);
 static void    tbl_vrule(struct termp *, const struct tbl_head *);
                        const struct roffcol *);
 static void    tbl_hrule(struct termp *, const struct tbl_span *);
 static void    tbl_vrule(struct termp *, const struct tbl_head *);


@@ -66,7 +66,7 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
        const struct tbl_dat    *dp;
        struct roffcol          *col;
        int                      spans;
        const struct tbl_dat    *dp;
        struct roffcol          *col;
        int                      spans;

-       size_t                   rmargin, maxrmargin;
+       size_t                   rmargin, maxrmargin;

 
        rmargin = tp->rmargin;
        maxrmargin = tp->maxrmargin;
 
        rmargin = tp->rmargin;
        maxrmargin = tp->maxrmargin;


@@ -96,18 +96,19 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
        /* Horizontal frame at the start of boxed tables. */
 
        if (TBL_SPAN_FIRST & sp->flags) {
        /* 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);
                        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. */
 
                        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 | TBL_OPT_DBOX) & sp->opts->opts ||
+           sp->head->vert)

                term_word(tp, TBL_SPAN_HORIZ == sp->pos ||
                term_word(tp, TBL_SPAN_HORIZ == sp->pos ||

-                       TBL_SPAN_DHORIZ == sp->pos ? "+" : "|");
+                   TBL_SPAN_DHORIZ == sp->pos ? "+" : "|");

 
        /*
         * Now print the actual data itself depending on the span type.
 
        /*
         * Now print the actual data itself depending on the span type.


@@ -116,18 +117,18 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
         */
 
        switch (sp->pos) {
         */
 
        switch (sp->pos) {

-       case (TBL_SPAN_HORIZ):
+       case TBL_SPAN_HORIZ:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (TBL_SPAN_DHORIZ):
+       case TBL_SPAN_DHORIZ:

                tbl_hrule(tp, sp);
                break;
                tbl_hrule(tp, sp);
                break;

-       case (TBL_SPAN_DATA):
+       case TBL_SPAN_DATA:

                /* Iterate over template headers. */
                dp = sp->first;
                spans = 0;
                for (hp = sp->head; hp; hp = hp->next) {
 
                /* Iterate over template headers. */
                dp = sp->first;
                spans = 0;
                for (hp = sp->head; hp; hp = hp->next) {
 

-                       /* 
+                       /*

                         * If the current data header is invoked during
                         * a spanner ("spans" > 0), don't emit anything
                         * at all.
                         * If the current data header is invoked during
                         * a spanner ("spans" > 0), don't emit anything
                         * at all.


@@ -142,9 +143,9 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
                                tbl_vrule(tp, hp);
 
                        col = &tp->tbl.cols[hp->ident];
                                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
                         * number of subsequent spans, if applicable.
                         */
                         * Go to the next data cell and assign the
                         * number of subsequent spans, if applicable.
                         */


@@ -159,9 +160,10 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
 
        /* Vertical frame at the end of each row. */
 
 
        /* 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 | TBL_OPT_DBOX) & sp->opts->opts ||
+           sp->layout->vert)

                term_word(tp, TBL_SPAN_HORIZ == sp->pos ||
                term_word(tp, TBL_SPAN_HORIZ == sp->pos ||

-                       TBL_SPAN_DHORIZ == sp->pos ? "+" : " |");
+                   TBL_SPAN_DHORIZ == sp->pos ? "+" : " |");

        term_flushln(tp);
 
        /*
        term_flushln(tp);
 
        /*


@@ -170,11 +172,15 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
         */
 
        if (TBL_SPAN_LAST & sp->flags) {
         */
 
        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);
                        tbl_hframe(tp, sp, 0);

-               if (TBL_OPT_DBOX & sp->tbl->opts)
+                       tp->skipvsp = 1;
+               }
+               if (TBL_OPT_DBOX & sp->opts->opts) {

                        tbl_hframe(tp, sp, 1);
                        tbl_hframe(tp, sp, 1);

+                       tp->skipvsp = 2;
+               }

                assert(tp->tbl.cols);
                free(tp->tbl.cols);
                tp->tbl.cols = NULL;
                assert(tp->tbl.cols);
                free(tp->tbl.cols);
                tp->tbl.cols = NULL;


@@ -250,9 +256,9 @@ tbl_hframe(struct termp *tp, const struct tbl_span *sp, int outer)
 }
 
 static void
 }
 
 static void

-tbl_data(struct termp *tp, const struct tbl *tbl,
-               const struct tbl_dat *dp, 
-               const struct roffcol *col)
+tbl_data(struct termp *tp, const struct tbl_opts *opts,
+       const struct tbl_dat *dp,
+       const struct roffcol *col)

 {
 
        if (NULL == dp) {
 {
 
        if (NULL == dp) {


@@ -262,43 +268,43 @@ tbl_data(struct termp *tp, const struct tbl *tbl,
        assert(dp->layout);
 
        switch (dp->pos) {
        assert(dp->layout);
 
        switch (dp->pos) {

-       case (TBL_DATA_NONE):
+       case TBL_DATA_NONE:

                tbl_char(tp, ASCII_NBRSP, col->width);
                return;
                tbl_char(tp, ASCII_NBRSP, col->width);
                return;

-       case (TBL_DATA_HORIZ):
+       case TBL_DATA_HORIZ:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (TBL_DATA_NHORIZ):
+       case TBL_DATA_NHORIZ:

                tbl_char(tp, '-', col->width);
                return;
                tbl_char(tp, '-', col->width);
                return;

-       case (TBL_DATA_NDHORIZ):
+       case TBL_DATA_NDHORIZ:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (TBL_DATA_DHORIZ):
+       case TBL_DATA_DHORIZ:

                tbl_char(tp, '=', col->width);
                return;
        default:
                break;
        }
                tbl_char(tp, '=', col->width);
                return;
        default:
                break;
        }

-       
+

        switch (dp->layout->pos) {
        switch (dp->layout->pos) {

-       case (TBL_CELL_HORIZ):
+       case TBL_CELL_HORIZ:

                tbl_char(tp, '-', col->width);
                break;
                tbl_char(tp, '-', col->width);
                break;

-       case (TBL_CELL_DHORIZ):
+       case TBL_CELL_DHORIZ:

                tbl_char(tp, '=', col->width);
                break;
                tbl_char(tp, '=', col->width);
                break;

-       case (TBL_CELL_LONG):
+       case TBL_CELL_LONG:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (TBL_CELL_CENTRE):
+       case TBL_CELL_CENTRE:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (TBL_CELL_LEFT):
+       case TBL_CELL_LEFT:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (TBL_CELL_RIGHT):
+       case TBL_CELL_RIGHT:

                tbl_literal(tp, dp, col);
                break;
                tbl_literal(tp, dp, col);
                break;

-       case (TBL_CELL_NUMBER):
-               tbl_number(tp, tbl, dp, col);
+       case TBL_CELL_NUMBER:
+               tbl_number(tp, opts, dp, col);

                break;
                break;

-       case (TBL_CELL_DOWN):
+       case TBL_CELL_DOWN:

                tbl_char(tp, ASCII_NBRSP, col->width);
                break;
        default:
                tbl_char(tp, ASCII_NBRSP, col->width);
                break;
        default:


@@ -334,28 +340,36 @@ tbl_char(struct termp *tp, char c, size_t len)
 }
 
 static void
 }
 
 static void

-tbl_literal(struct termp *tp, const struct tbl_dat *dp, 
+tbl_literal(struct termp *tp, const struct tbl_dat *dp,

                const struct roffcol *col)
 {
                const struct roffcol *col)
 {

-       size_t           len, padl, padr;
+       struct tbl_head         *hp;
+       size_t                   width, len, padl, padr;
+       int                      spans;

 
        assert(dp->string);
        len = term_strlen(tp, dp->string);
 
        assert(dp->string);
        len = term_strlen(tp, dp->string);

-       padr = col->width > len ? col->width - len : 0;
+
+       hp = dp->layout->head->next;
+       width = col->width;
+       for (spans = dp->spans; spans--; hp = hp->next)
+               width += tp->tbl.cols[hp->ident].width + 3;
+
+       padr = width > len ? width - len : 0;

        padl = 0;
 
        switch (dp->layout->pos) {
        padl = 0;
 
        switch (dp->layout->pos) {

-       case (TBL_CELL_LONG):
+       case TBL_CELL_LONG:

                padl = term_len(tp, 1);
                padr = padr > padl ? padr - padl : 0;
                break;
                padl = term_len(tp, 1);
                padr = padr > padl ? padr - padl : 0;
                break;

-       case (TBL_CELL_CENTRE):
+       case TBL_CELL_CENTRE:

                if (2 > padr)
                        break;
                padl = padr / 2;
                padr -= padl;
                break;
                if (2 > padr)
                        break;
                padl = padr / 2;
                padr -= padl;
                break;

-       case (TBL_CELL_RIGHT):
+       case TBL_CELL_RIGHT:

                padl = padr;
                padr = 0;
                break;
                padl = padr;
                padr = 0;
                break;


@@ -369,7 +383,7 @@ tbl_literal(struct termp *tp, const struct tbl_dat *dp,
 }
 
 static void
 }
 
 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)
 {
                const struct tbl_dat *dp,
                const struct roffcol *col)
 {


@@ -387,12 +401,12 @@ tbl_number(struct termp *tp, const struct tbl *tbl,
 
        sz = term_strlen(tp, dp->string);
 
 
        sz = term_strlen(tp, dp->string);
 

-       buf[0] = tbl->decimal;
+       buf[0] = opts->decimal;

        buf[1] = '\0';
 
        psz = term_strlen(tp, buf);
 
        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];
                buf[1] = '\0';
                for (ssz = 0, i = 0; cp != &dp->string[i]; i++) {
                        buf[0] = dp->string[i];