===================================================================
RCS file: /cvs/mandoc/out.c,v
retrieving revision 1.30
retrieving revision 1.36
diff -u -p -r1.30 -r1.36
--- mandoc/out.c	2011/01/05 15:37:23	1.30
+++ mandoc/out.c	2011/01/25 12:07:30	1.36
@@ -1,6 +1,6 @@
-/*	$Id: out.c,v 1.30 2011/01/05 15:37:23 kristaps Exp $ */
+/*	$Id: out.c,v 1.36 2011/01/25 12:07:30 schwarze Exp $ */
 /*
- * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -399,8 +399,7 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp
 		 * to data cells in the data section.
 		 */
 		for (dp = sp->first; dp; dp = dp->next) {
-			if (NULL == dp->layout)
-				continue;
+			assert(dp->layout);
 			col = &tbl->cols[dp->layout->head->ident];
 			tblcalc_data(tbl, col, sp->tbl, dp);
 		}
@@ -454,6 +453,8 @@ tblcalc_data(struct rofftbl *tbl, struct roffcol *col,
 	case (TBL_CELL_NUMBER):
 		tblcalc_number(tbl, col, tp, dp);
 		break;
+	case (TBL_CELL_DOWN):
+		break;
 	default:
 		abort();
 		/* NOTREACHED */
@@ -465,6 +466,7 @@ tblcalc_literal(struct rofftbl *tbl, struct roffcol *c
 		const struct tbl_dat *dp)
 {
 	size_t		 sz, bufsz, spsz;
+	const char	*str;
 
 	/* 
 	 * Calculate our width and use the spacing, with a minimum
@@ -472,16 +474,18 @@ tblcalc_literal(struct rofftbl *tbl, struct roffcol *c
 	 * either side, while right/left get a single adjacent space).
 	 */
 
-	sz = bufsz = spsz = 0;
-	if (dp->string)
-		sz = (*tbl->slen)(dp->string, tbl->arg);
+	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)(2, tbl->arg);
+		bufsz = (*tbl->len)(1, tbl->arg);
 		break;
 	default:
 		bufsz = (*tbl->len)(1, tbl->arg);
@@ -504,12 +508,10 @@ tblcalc_number(struct rofftbl *tbl, struct roffcol *co
 {
 	int 		 i;
 	size_t		 sz, psz, ssz, d;
-	char		*cp;
 	const char	*str;
+	char		*cp;
 	char		 buf[2];
 
-	/* TODO: use spacing modifier. */
-
 	/*
 	 * First calculate number width and decimal place (last + 1 for
 	 * no-decimal numbers).  If the stored decimal is subsequent
@@ -519,18 +521,17 @@ tblcalc_number(struct rofftbl *tbl, struct roffcol *co
 	 * Finally, re-assign the stored values.
 	 */
 
-	str = "";
-	if (dp->string)
-		str = dp->string;
-
+	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 = strchr(str, tp->decimal))) {
+	if (NULL != (cp = strrchr(str, tp->decimal))) {
 		buf[1] = '\0';
 		for (ssz = 0, i = 0; cp != &str[i]; i++) {
 			buf[0] = str[i];
@@ -557,6 +558,11 @@ tblcalc_number(struct rofftbl *tbl, struct roffcol *co
 		col->width = sz;
 	if (d > col->decimal)
 		col->decimal = d;
+
+	/* Adjust for stipulated width. */
+
+	if (col->width < dp->layout->spacing)
+		col->width = dp->layout->spacing;
 }