Flip on -Tutf8 backend support. This forces the UTF-8 LC_CTYPE and does

[mandoc.git] / term_ascii.c

diff --git a/term_ascii.c b/term_ascii.c
index 3b4ca241196dc1582f038cd8f2cc662775e89a28..e65f590a712b7b012952d9fff8e39609d26341ae 100644 (file)
--- a/term_ascii.c
+++ b/term_ascii.c
@@ -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>
  *
 /*
  * 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;
 
        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;
                }
                        p->enc = enc;
                        p->advance = locale_advance;
                        p->endline = locale_endline;
                        p->letter = locale_letter;
                        p->width = locale_width;
                }

+       }

 #endif
 
        toks[0] = "width";
 #endif
 
        toks[0] = "width";


@@ -126,6 +130,14 @@ ascii_alloc(char *outopts)
        return(ascii_init(TERMENC_ASCII, outopts));
 }
 
        return(ascii_init(TERMENC_ASCII, outopts));
 }
 

+void *
+utf8_alloc(char *outopts)
+{
+
+       return(ascii_init(TERMENC_UTF8, outopts));
+}
+
+

 void *
 locale_alloc(char *outopts)
 {
 void *
 locale_alloc(char *outopts)
 {