===================================================================
RCS file: /cvs/mandoc/term_ascii.c,v
retrieving revision 1.53
retrieving revision 1.56
diff -u -p -r1.53 -r1.56
--- mandoc/term_ascii.c	2016/07/08 22:29:05	1.53
+++ mandoc/term_ascii.c	2017/05/08 15:34:54	1.56
@@ -1,7 +1,7 @@
-/*	$Id: term_ascii.c,v 1.53 2016/07/08 22:29:05 schwarze Exp $ */
+/*	$Id: term_ascii.c,v 1.56 2017/05/08 15:34:54 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -68,7 +68,6 @@ ascii_init(enum termenc enc, const struct manoutput *o
 	p = mandoc_calloc(1, sizeof(struct termp));
 
 	p->line = 1;
-	p->tabwidth = 5;
 	p->defrmargin = p->lastrmargin = 78;
 	p->fontq = mandoc_reallocarray(NULL,
 	     (p->fontsz = 8), sizeof(enum termfont));
@@ -98,7 +97,7 @@ ascii_init(enum termenc enc, const struct manoutput *o
 
 		v = TERMENC_LOCALE == enc ?
 		    setlocale(LC_CTYPE, "") :
-		    setlocale(LC_CTYPE, "en_US.UTF-8");
+		    setlocale(LC_CTYPE, UTF8_LOCALE);
 		if (NULL != v && MB_CUR_MAX > 1) {
 			p->enc = enc;
 			p->advance = locale_advance;
@@ -216,6 +215,8 @@ ascii_endline(struct termp *p)
 {
 
 	p->line++;
+	p->offset -= p->ti;
+	p->ti = 0;
 	putchar('\n');
 }
 
@@ -370,6 +371,8 @@ locale_endline(struct termp *p)
 {
 
 	p->line++;
+	p->offset -= p->ti;
+	p->ti = 0;
 	putwchar(L'\n');
 }