===================================================================
RCS file: /cvs/mandoc/out.c,v
retrieving revision 1.43
retrieving revision 1.50
diff -u -p -r1.43 -r1.50
--- mandoc/out.c	2011/09/20 23:05:49	1.43
+++ mandoc/out.c	2014/08/10 23:54:41	1.50
@@ -1,4 +1,4 @@
-/*	$Id: out.c,v 1.43 2011/09/20 23:05:49 schwarze Exp $ */
+/*	$Id: out.c,v 1.50 2014/08/10 23:54:41 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,9 +15,7 @@
  * 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>
 
@@ -28,17 +26,19 @@
 #include <string.h>
 #include <time.h>
 
+#include "mandoc_aux.h"
 #include "mandoc.h"
 #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
  * units are documented in groff.7, mdoc.7, man.7.
  */
@@ -55,10 +55,10 @@ a2roffsu(const char *src, struct roffsu *dst, enum rof
 	i = hasd = 0;
 
 	switch (*src) {
-	case ('+'):
+	case '+':
 		src++;
 		break;
-	case ('-'):
+	case '-':
 		buf[i++] = *src++;
 		break;
 	default:
@@ -86,39 +86,39 @@ a2roffsu(const char *src, struct roffsu *dst, enum rof
 	buf[i] = '\0';
 
 	switch (*src) {
-	case ('c'):
+	case 'c':
 		unit = SCALE_CM;
 		break;
-	case ('i'):
+	case 'i':
 		unit = SCALE_IN;
 		break;
-	case ('P'):
+	case 'P':
 		unit = SCALE_PC;
 		break;
-	case ('p'):
+	case 'p':
 		unit = SCALE_PT;
 		break;
-	case ('f'):
+	case 'f':
 		unit = SCALE_FS;
 		break;
-	case ('v'):
+	case 'v':
 		unit = SCALE_VS;
 		break;
-	case ('m'):
+	case 'm':
 		unit = SCALE_EM;
 		break;
-	case ('\0'):
+	case '\0':
 		if (SCALE_MAX == def)
 			return(0);
 		unit = SCALE_BU;
 		break;
-	case ('u'):
+	case 'u':
 		unit = SCALE_BU;
 		break;
-	case ('M'):
+	case 'M':
 		unit = SCALE_MM;
 		break;
-	case ('n'):
+	case 'n':
 		unit = SCALE_EN;
 		break;
 	default:
@@ -126,8 +126,8 @@ a2roffsu(const char *src, struct roffsu *dst, enum rof
 	}
 
 	/* FIXME: do this in the caller. */
-	if ((dst->scale = atof(buf)) < 0)
-		dst->scale = 0;
+	if ((dst->scale = atof(buf)) < 0.0)
+		dst->scale = 0.0;
 	dst->unit = unit;
 	return(1);
 }
@@ -142,7 +142,6 @@ void
 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp)
 {
 	const struct tbl_dat	*dp;
-	const struct tbl_head	*hp;
 	struct roffcol		*col;
 	int			 spans;
 
@@ -153,11 +152,9 @@ 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));
+	tbl->cols = mandoc_calloc((size_t)sp->opts->cols,
+	    sizeof(struct roffcol));
 
-	hp = sp->head;
-
 	for ( ; sp; sp = sp->next) {
 		if (TBL_SPAN_DATA != sp->pos)
 			continue;
@@ -175,59 +172,40 @@ 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);
 		}
 	}
-
-	/* 
-	 * Calculate width of the spanners.  These get one space for a
-	 * vertical line, two for a double-vertical line. 
-	 */
-
-	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;
-		}
-	}
 }
 
 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;
 
 	/* Branch down into data sub-types. */
 
 	switch (dp->layout->pos) {
-	case (TBL_CELL_HORIZ):
+	case TBL_CELL_HORIZ:
 		/* FALLTHROUGH */
-	case (TBL_CELL_DHORIZ):
+	case TBL_CELL_DHORIZ:
 		sz = (*tbl->len)(1, tbl->arg);
 		if (col->width < sz)
 			col->width = sz;
 		break;
-	case (TBL_CELL_LONG):
+	case TBL_CELL_LONG:
 		/* FALLTHROUGH */
-	case (TBL_CELL_CENTRE):
+	case TBL_CELL_CENTRE:
 		/* FALLTHROUGH */
-	case (TBL_CELL_LEFT):
+	case TBL_CELL_LEFT:
 		/* FALLTHROUGH */
-	case (TBL_CELL_RIGHT):
+	case TBL_CELL_RIGHT:
 		tblcalc_literal(tbl, col, dp);
 		break;
-	case (TBL_CELL_NUMBER):
-		tblcalc_number(tbl, col, tp, dp);
+	case TBL_CELL_NUMBER:
+		tblcalc_number(tbl, col, opts, dp);
 		break;
-	case (TBL_CELL_DOWN):
+	case TBL_CELL_DOWN:
 		break;
 	default:
 		abort();
@@ -251,9 +229,9 @@ tblcalc_literal(struct rofftbl *tbl, struct roffcol *c
 
 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;
+	int		 i;
 	size_t		 sz, psz, ssz, d;
 	const char	*str;
 	char		*cp;
@@ -273,12 +251,12 @@ tblcalc_number(struct rofftbl *tbl, struct roffcol *co
 
 	/* 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];