===================================================================
RCS file: /cvs/mandoc/term_ascii.c,v
retrieving revision 1.51
retrieving revision 1.56
diff -u -p -r1.51 -r1.56
--- mandoc/term_ascii.c	2015/10/13 22:59:54	1.51
+++ mandoc/term_ascii.c	2017/05/08 15:34:54	1.56
@@ -1,7 +1,7 @@
-/*	$Id: term_ascii.c,v 1.51 2015/10/13 22:59:54 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));
@@ -88,9 +87,17 @@ ascii_init(enum termenc enc, const struct manoutput *o
 
 #if HAVE_WCHAR
 	if (TERMENC_ASCII != enc) {
+
+		/*
+		 * Do not change any of this to LC_ALL.  It might break
+		 * the formatting by subtly changing the behaviour of
+		 * various functions, for example strftime(3).  As a
+		 * worst case, it might even cause buffer overflows.
+		 */
+
 		v = TERMENC_LOCALE == enc ?
-		    setlocale(LC_ALL, "") :
-		    setlocale(LC_CTYPE, "en_US.UTF-8");
+		    setlocale(LC_CTYPE, "") :
+		    setlocale(LC_CTYPE, UTF8_LOCALE);
 		if (NULL != v && MB_CUR_MAX > 1) {
 			p->enc = enc;
 			p->advance = locale_advance;
@@ -155,18 +162,17 @@ ascii_setwidth(struct termp *p, int iop, int width)
 }
 
 void
-ascii_sepline(void *arg)
+terminal_sepline(void *arg)
 {
 	struct termp	*p;
 	size_t		 i;
 
 	p = (struct termp *)arg;
-	p->line += 3;
-	putchar('\n');
+	(*p->endline)(p);
 	for (i = 0; i < p->defrmargin; i++)
-		putchar('-');
-	putchar('\n');
-	putchar('\n');
+		(*p->letter)(p, '-');
+	(*p->endline)(p);
+	(*p->endline)(p);
 }
 
 static size_t
@@ -209,6 +215,8 @@ ascii_endline(struct termp *p)
 {
 
 	p->line++;
+	p->offset -= p->ti;
+	p->ti = 0;
 	putchar('\n');
 }
 
@@ -363,6 +371,8 @@ locale_endline(struct termp *p)
 {
 
 	p->line++;
+	p->offset -= p->ti;
+	p->ti = 0;
 	putwchar(L'\n');
 }