===================================================================
RCS file: /cvs/mandoc/tbl_term.c,v
retrieving revision 1.33
retrieving revision 1.35
diff -u -p -r1.33 -r1.35
--- mandoc/tbl_term.c	2015/01/27 05:21:45	1.33
+++ mandoc/tbl_term.c	2015/01/30 02:09:04	1.35
@@ -1,4 +1,4 @@
-/*	$Id: tbl_term.c,v 1.33 2015/01/27 05:21:45 schwarze Exp $ */
+/*	$Id: tbl_term.c,v 1.35 2015/01/30 02:09:04 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -63,8 +63,9 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
 	const struct tbl_head	*hp;
 	const struct tbl_cell	*cp;
 	const struct tbl_dat	*dp;
+	static size_t		 offset;
+	size_t			 rmargin, maxrmargin, tsz;
 	int			 horiz, spans, vert;
-	size_t			 rmargin, maxrmargin;
 
 	rmargin = tp->rmargin;
 	maxrmargin = tp->maxrmargin;
@@ -90,6 +91,21 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
 
 		tblcalc(&tp->tbl, sp, rmargin - tp->offset);
 
+		/* Center the table as a whole. */
+
+		offset = tp->offset;
+		if (sp->opts->opts & TBL_OPT_CENTRE) {
+			tsz = sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX)
+			    ? 2 : !!sp->opts->lvert + !!sp->opts->rvert;
+			for (hp = sp->head; hp != NULL; hp = hp->next)
+				tsz += tp->tbl.cols[hp->ident].width + 3;
+			tsz -= 3;
+			if (offset + tsz > rmargin)
+				tsz -= 1;
+			tp->offset = (offset + rmargin > tsz) ?
+			    (offset + rmargin - tsz) / 2 : 0;
+		}
+
 		/* Horizontal frame at the start of boxed tables. */
 
 		if (sp->opts->opts & TBL_OPT_DBOX)
@@ -189,12 +205,12 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
 		assert(tp->tbl.cols);
 		free(tp->tbl.cols);
 		tp->tbl.cols = NULL;
+		tp->offset = offset;
 	}
 
 	tp->flags &= ~TERMP_NONOSPACE;
 	tp->rmargin = rmargin;
 	tp->maxrmargin = maxrmargin;
-
 }
 
 /*
@@ -246,11 +262,10 @@ tbl_data(struct termp *tp, const struct tbl_opts *opts
 	const struct roffcol *col)
 {
 
-	if (NULL == dp) {
+	if (dp == NULL) {
 		tbl_char(tp, ASCII_NBRSP, col->width);
 		return;
 	}
-	assert(dp->layout);
 
 	switch (dp->pos) {
 	case TBL_DATA_NONE:
@@ -380,8 +395,7 @@ tbl_number(struct termp *tp, const struct tbl_opts *op
 
 	psz = term_strlen(tp, buf);
 
-	if (NULL != (cp = strrchr(dp->string, opts->decimal))) {
-		buf[1] = '\0';
+	if ((cp = strrchr(dp->string, opts->decimal)) != NULL) {
 		for (ssz = 0, i = 0; cp != &dp->string[i]; i++) {
 			buf[0] = dp->string[i];
 			ssz += term_strlen(tp, buf);