===================================================================
RCS file: /cvs/mandoc/term_ascii.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- mandoc/term_ascii.c	2011/05/19 15:48:58	1.16
+++ mandoc/term_ascii.c	2011/05/20 15:48:22	1.17
@@ -1,4 +1,4 @@
-/*	$Id: term_ascii.c,v 1.16 2011/05/19 15:48:58 kristaps Exp $ */
+/*	$Id: term_ascii.c,v 1.17 2011/05/20 15:48:22 kristaps Exp $ */
 /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -89,15 +89,19 @@ ascii_init(enum termenc enc, char *outopts)
 	p->letter = ascii_letter;
 	p->width = ascii_width;
 
-#if defined (USE_WCHAR)
-	if (TERMENC_LOCALE == enc)
-		if (setlocale(LC_ALL, "") && MB_CUR_MAX > 1) {
+#ifdef	USE_WCHAR
+	if (TERMENC_ASCII != enc) {
+		v = TERMENC_LOCALE == enc ?
+			setlocale(LC_ALL, "") :
+			setlocale(LC_CTYPE, "UTF-8");
+		if (NULL != v && MB_CUR_MAX > 1) {
 			p->enc = enc;
 			p->advance = locale_advance;
 			p->endline = locale_endline;
 			p->letter = locale_letter;
 			p->width = locale_width;
 		}
+	}
 #endif
 
 	toks[0] = "width";
@@ -125,6 +129,14 @@ ascii_alloc(char *outopts)
 
 	return(ascii_init(TERMENC_ASCII, outopts));
 }
+
+void *
+utf8_alloc(char *outopts)
+{
+
+	return(ascii_init(TERMENC_UTF8, outopts));
+}
+
 
 void *
 locale_alloc(char *outopts)