===================================================================
RCS file: /cvs/mandoc/term_ascii.c,v
retrieving revision 1.62
retrieving revision 1.64
diff -u -p -r1.62 -r1.64
--- mandoc/term_ascii.c	2018/08/18 15:17:03	1.62
+++ mandoc/term_ascii.c	2018/11/28 14:23:06	1.64
@@ -1,4 +1,4 @@
-/*	$Id: term_ascii.c,v 1.62 2018/08/18 15:17:03 schwarze Exp $ */
+/*	$Id: term_ascii.c,v 1.64 2018/11/28 14:23:06 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -90,7 +90,7 @@ ascii_init(enum termenc enc, const struct manoutput *o
 	p->width = ascii_width;
 
 #if HAVE_WCHAR
-	if (TERMENC_ASCII != enc) {
+	if (enc != TERMENC_ASCII) {
 
 		/*
 		 * Do not change any of this to LC_ALL.  It might break
@@ -99,7 +99,7 @@ ascii_init(enum termenc enc, const struct manoutput *o
 		 * worst case, it might even cause buffer overflows.
 		 */
 
-		v = TERMENC_LOCALE == enc ?
+		v = enc == TERMENC_LOCALE ?
 		    setlocale(LC_CTYPE, "") :
 		    setlocale(LC_CTYPE, UTF8_LOCALE);
 
@@ -113,7 +113,7 @@ ascii_init(enum termenc enc, const struct manoutput *o
 			v = setlocale(LC_CTYPE, "C");
 
 		if (v != NULL && MB_CUR_MAX > 1) {
-			p->enc = enc;
+			p->enc = TERMENC_UTF8;
 			p->advance = locale_advance;
 			p->endline = locale_endline;
 			p->letter = locale_letter;
@@ -310,7 +310,7 @@ ascii_uc2str(int uc)
 	"<88>",	"<89>",	"<8A>",	"<8B>",	"<8C>",	"<8D>",	"<8E>",	"<8F>",
 	"<90>",	"<91>",	"<92>",	"<93>",	"<94>",	"<95>",	"<96>",	"<97>",
 	"<98>",	"<99>",	"<9A>",	"<9B>",	"<9C>",	"<9D>",	"<9E>",	"<9F>",
-	nbrsp,	"!",	"/\bc",	"GBP",	"o\bx",	"=\bY",	"|",	"<section>",
+	nbrsp,	"!",	"/\bc",	"-\bL",	"o\bx",	"=\bY",	"|",	"<section>",
 	"\"",	"(C)",	"_\ba",	"<<",	"~",	"",	"(R)",	"-",
 	"<degree>","+-","^2",	"^3",	"'","<micro>","<paragraph>",".",
 	",",	"^1",	"_\bo",	">>",	"1/4",	"1/2",	"3/4",	"?",