===================================================================
RCS file: /cvs/mandoc/out.c,v
retrieving revision 1.52
retrieving revision 1.54
diff -u -p -r1.52 -r1.54
--- mandoc/out.c	2014/10/14 02:16:06	1.52
+++ mandoc/out.c	2014/12/04 02:05:42	1.54
@@ -1,4 +1,4 @@
-/*	$Id: out.c,v 1.52 2014/10/14 02:16:06 schwarze Exp $ */
+/*	$Id: out.c,v 1.54 2014/12/04 02:05:42 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -110,7 +110,7 @@ a2roffsu(const char *src, struct roffsu *dst, enum rof
 	case '\0':
 		if (SCALE_MAX == def)
 			return(0);
-		unit = SCALE_EN;
+		unit = def;
 		break;
 	case 'u':
 		unit = SCALE_BU;
@@ -158,7 +158,7 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp
 	tbl->cols = mandoc_calloc((size_t)sp->opts->cols,
 	    sizeof(struct roffcol));
 
-	for (maxcol = 0; sp; sp = sp->next) {
+	for (maxcol = -1; sp; sp = sp->next) {
 		if (TBL_SPAN_DATA != sp->pos)
 			continue;
 		spans = 1;