-/* $Id: out.c,v 1.9 2009/11/07 14:14:15 kristaps Exp $ */
+/* $Id: out.c,v 1.41 2011/07/17 15:24:25 kristaps Exp $ */
/*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * 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
* 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 <sys/types.h>
#include <assert.h>
#include <string.h>
#include <time.h>
+#include "mandoc.h"
#include "out.h"
-#ifdef __linux__
-extern size_t strlcat(char *, const char *, size_t);
-#endif
+static void tblcalc_data(struct rofftbl *, struct roffcol *,
+ const struct tbl *, 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 *);
/*
* Convert a `scaling unit' to a consistent form, or fail. Scaling
return(0);
}
+ /* FIXME: do this in the caller. */
if ((dst->scale = atof(buf)) < 0)
dst->scale = 0;
dst->unit = unit;
- dst->pt = hasd;
-
return(1);
}
-
/*
- * Correctly writes the time in nroff form, which differs from standard
- * form in that a space isn't printed in lieu of the extra %e field for
- * single-digit dates.
+ * Calculate the abstract widths and decimal positions of columns in a
+ * table. This routine allocates the columns structures then runs over
+ * all rows and cells in the table. The function pointers in "tbl" are
+ * used for the actual width calculations.
*/
void
-time2a(time_t t, char *dst, size_t sz)
+tblcalc(struct rofftbl *tbl, const struct tbl_span *sp)
{
- struct tm tm;
- char buf[5];
- char *p;
- size_t nsz;
-
- assert(sz > 1);
- localtime_r(&t, &tm);
-
- p = dst;
- nsz = 0;
-
- dst[0] = '\0';
-
- if (0 == (nsz = strftime(p, sz, "%B ", &tm)))
- return;
-
- p += (int)nsz;
- sz -= nsz;
-
- if (0 == strftime(buf, sizeof(buf), "%e, ", &tm))
- return;
-
- nsz = strlcat(p, buf + (' ' == buf[0] ? 1 : 0), sz);
-
- if (nsz >= sz)
- return;
+ const struct tbl_dat *dp;
+ const struct tbl_head *hp;
+ struct roffcol *col;
+
+ /*
+ * Allocate the master column specifiers. These will hold the
+ * widths and decimal positions for all cells in the column. It
+ * must be freed and nullified by the caller.
+ */
+
+ assert(NULL == tbl->cols);
+ tbl->cols = mandoc_calloc
+ ((size_t)sp->tbl->cols, sizeof(struct roffcol));
+
+ hp = sp->head;
+
+ for ( ; sp; sp = sp->next) {
+ if (TBL_SPAN_DATA != sp->pos)
+ continue;
+ /*
+ * Account for the data cells in the layout, matching it
+ * to data cells in the data section.
+ */
+ for (dp = sp->first; dp; dp = dp->next) {
+ assert(dp->layout);
+ col = &tbl->cols[dp->layout->head->ident];
+ tblcalc_data(tbl, col, sp->tbl, dp);
+ }
+ }
- p += (int)nsz;
- sz -= nsz;
+ /*
+ * Calculate width of the spanners. These get one space for a
+ * vertical line, two for a double-vertical line.
+ */
- (void)strftime(p, sz, "%Y", &tm);
+ for ( ; hp; hp = hp->next) {
+ col = &tbl->cols[hp->ident];
+ switch (hp->pos) {
+ case (TBL_HEAD_VERT):
+ col->width = (*tbl->len)(1, tbl->arg);
+ break;
+ case (TBL_HEAD_DVERT):
+ col->width = (*tbl->len)(2, tbl->arg);
+ break;
+ default:
+ break;
+ }
+ }
}
-
-/* Returns length of parsed string. */
-int
-a2roffdeco(enum roffdeco *d,
- const char **word, size_t *sz)
+static void
+tblcalc_data(struct rofftbl *tbl, struct roffcol *col,
+ const struct tbl *tp, const struct tbl_dat *dp)
{
- int j, type, sv, t, lim;
- const char *wp;
+ size_t sz;
- *d = DECO_NONE;
- wp = *word;
- type = 1;
+ /* Branch down into data sub-types. */
- switch (*wp) {
- case ('\0'):
- return(0);
-
- case ('('):
- wp++;
- if ('\0' == *wp)
- return(1);
- if ('\0' == *(wp + 1))
- return(2);
-
- *d = DECO_SPECIAL;
- *sz = 2;
- *word = wp;
- return(3);
-
- case ('*'):
- wp++;
-
- switch (*wp) {
- case ('\0'):
- return(1);
-
- case ('('):
- wp++;
- if ('\0' == *wp)
- return(2);
- if ('\0' == *(wp + 1))
- return(3);
-
- *d = DECO_RESERVED;
- *sz = 2;
- *word = wp;
- return(4);
-
- case ('['):
- type = 0;
- break;
+ switch (dp->layout->pos) {
+ case (TBL_CELL_HORIZ):
+ /* FALLTHROUGH */
+ case (TBL_CELL_DHORIZ):
+ sz = (*tbl->len)(1, tbl->arg);
+ if (col->width < sz)
+ col->width = sz;
+ break;
+ case (TBL_CELL_LONG):
+ /* FALLTHROUGH */
+ case (TBL_CELL_CENTRE):
+ /* FALLTHROUGH */
+ case (TBL_CELL_LEFT):
+ /* FALLTHROUGH */
+ case (TBL_CELL_RIGHT):
+ tblcalc_literal(tbl, col, dp);
+ break;
+ case (TBL_CELL_NUMBER):
+ tblcalc_number(tbl, col, tp, dp);
+ break;
+ case (TBL_CELL_DOWN):
+ break;
+ default:
+ abort();
+ /* NOTREACHED */
+ }
+}
- default:
- *d = DECO_RESERVED;
- *sz = 1;
- *word = wp;
- return(2);
- }
+static void
+tblcalc_literal(struct rofftbl *tbl, struct roffcol *col,
+ const struct tbl_dat *dp)
+{
+ size_t sz, bufsz, spsz;
+ const char *str;
+
+ /*
+ * 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).
+ */
+
+ bufsz = spsz = 0;
+ str = dp->string ? dp->string : "";
+ sz = (*tbl->slen)(str, tbl->arg);
+
+ /* FIXME: TBL_DATA_HORIZ et al.? */
+
+ assert(dp->layout);
+ switch (dp->layout->pos) {
+ case (TBL_CELL_LONG):
+ /* FALLTHROUGH */
+ case (TBL_CELL_CENTRE):
+ bufsz = (*tbl->len)(1, tbl->arg);
+ break;
+ default:
+ bufsz = (*tbl->len)(1, tbl->arg);
break;
+ }
-#if 0
- case ('s'):
- wp++;
-
- /* This closely follows mandoc_special(). */
- if ('\0' == *wp)
- return(1);
-
- t = 0;
- lim = 1;
-
- if (*wp == '\'') {
- lim = 0;
- t = 1;
- ++wp;
- } else if (*wp == '[') {
- lim = 0;
- t = 2;
- ++wp;
- } else if (*wp == '(') {
- lim = 2;
- t = 3;
- ++wp;
- }
+ if (dp->layout->spacing) {
+ spsz = (*tbl->len)(dp->layout->spacing, tbl->arg);
+ bufsz = bufsz > spsz ? bufsz : spsz;
+ }
- if (*wp == '+' || *wp == '-')
- ++wp;
-
- if (*wp == '\'') {
- if (t) {
- *word = wp;
- return;
- }
- lim = 0;
- t = 1;
- ++wp;
- } else if (*wp == '[') {
- if (t) {
- *word = wp;
- return;
- }
- lim = 0;
- t = 2;
- ++wp;
- } else if (*wp == '(') {
- if (t) {
- *word = wp;
- return;
- }
- lim = 2;
- t = 3;
- ++wp;
- }
+ sz += bufsz;
+ if (col->width < sz)
+ col->width = sz;
+}
- if ( ! isdigit((u_char)*wp)) {
- *word = --wp;
- return;
+static void
+tblcalc_number(struct rofftbl *tbl, struct roffcol *col,
+ const struct tbl *tp, const struct tbl_dat *dp)
+{
+ int i;
+ size_t sz, psz, ssz, d;
+ const char *str;
+ char *cp;
+ char buf[2];
+
+ /*
+ * 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.
+ */
+
+ str = dp->string ? dp->string : "";
+ sz = (*tbl->slen)(str, tbl->arg);
+
+ /* FIXME: TBL_DATA_HORIZ et al.? */
+
+ buf[0] = tp->decimal;
+ buf[1] = '\0';
+
+ psz = (*tbl->slen)(buf, tbl->arg);
+
+ if (NULL != (cp = strrchr(str, tp->decimal))) {
+ buf[1] = '\0';
+ for (ssz = 0, i = 0; cp != &str[i]; i++) {
+ buf[0] = str[i];
+ ssz += (*tbl->slen)(buf, tbl->arg);
}
+ d = ssz + psz;
+ } else
+ d = sz + psz;
- for (j = 0; isdigit((u_char)*wp); j++) {
- if (lim && j >= lim)
- break;
- ++wp;
- }
+ /* Padding. */
- if (t && t < 3) {
- if (1 == t && *wp != '\'') {
- *word = --wp;
- return;
- }
- if (2 == t && *wp != ']') {
- *word = --wp;
- return;
- }
- ++wp;
- }
- *word = --wp;
- return;
-#endif
+ sz += (*tbl->len)(2, tbl->arg);
+ d += (*tbl->len)(1, tbl->arg);
- case ('f'):
- wp++;
-
- switch (*wp) {
- case ('\0'):
- return(1);
- case ('3'):
- /* FALLTHROUGH */
- case ('B'):
- *d = DECO_BOLD;
- break;
- case ('2'):
- /* FALLTHROUGH */
- case ('I'):
- *d = DECO_ITALIC;
- break;
- case ('P'):
- *d = DECO_PREVIOUS;
- break;
- case ('1'):
- /* FALLTHROUGH */
- case ('R'):
- *d = DECO_ROMAN;
- break;
- default:
- break;
- }
+ /* Adjust the settings for this column. */
- return(2);
+ if (col->decimal > d) {
+ sz += col->decimal - d;
+ d = col->decimal;
+ } else
+ col->width += d - col->decimal;
- case ('['):
- break;
+ if (sz > col->width)
+ col->width = sz;
+ if (d > col->decimal)
+ col->decimal = d;
- default:
- *d = DECO_SPECIAL;
- *word = wp;
- *sz = 1;
- return(1);
- }
+ /* Adjust for stipulated width. */
- *word = ++wp;
- for (j = 0; *wp && ']' != *wp; wp++, j++)
- /* Loop... */ ;
+ if (col->width < dp->layout->spacing)
+ col->width = dp->layout->spacing;
+}
- if ('\0' == *wp)
- return(j + 1);
- *d = type ? DECO_SPECIAL : DECO_RESERVED;
- *sz = j;
- return (j + 2);
-}
git.ckatri.com / mandoc.git / blobdiff