===================================================================
RCS file: /cvs/mandoc/out.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- mandoc/out.c	2011/01/05 15:37:23	1.30
+++ mandoc/out.c	2011/01/08 17:00:27	1.31
@@ -1,4 +1,4 @@
-/*	$Id: out.c,v 1.30 2011/01/05 15:37:23 kristaps Exp $ */
+/*	$Id: out.c,v 1.31 2011/01/08 17:00:27 kristaps Exp $ */
 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -503,13 +503,11 @@ tblcalc_number(struct rofftbl *tbl, struct roffcol *co
 		const struct tbl *tp, const struct tbl_dat *dp)
 {
 	int 		 i;
-	size_t		 sz, psz, ssz, d;
+	size_t		 sz, psz, ssz, d, max;
 	char		*cp;
 	const char	*str;
 	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,9 +517,8 @@ tblcalc_number(struct rofftbl *tbl, struct roffcol *co
 	 * Finally, re-assign the stored values.
 	 */
 
-	str = "";
-	if (dp->string)
-		str = dp->string;
+	str = dp && dp->string ? dp->string : "";
+	max = dp && dp->layout ? dp->layout->spacing : 0;
 
 	sz = (*tbl->slen)(str, tbl->arg);
 
@@ -557,6 +554,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 < max)
+		col->width = max;
 }