diff options
| author | Kristaps Dzonsons <kristaps@bsd.lv> | 2011-05-20 15:48:22 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2011-05-20 15:48:22 +0000 |
| commit | 16620bc92834d5f0c26df4ec247eff77a6a39909 (patch) | |
| tree | a28be2c8a0f7f940306f1c22d89a7ca4a80ff734 /term_ascii.c | |
| parent | 7a5f476f06c95114ab8029b6d9acac4b6f85d053 (diff) | |
| download | mandoc-16620bc92834d5f0c26df4ec247eff77a6a39909.tar.gz | |
Flip on -Tutf8 backend support. This forces the UTF-8 LC_CTYPE and does
little else. Also remove the check for __STDC_ISO_10646__. It turns
out that very few systems---even those that support it---actually
declare this and it's just causing problems instead of being useful.
Diffstat (limited to 'term_ascii.c')
| -rw-r--r-- | term_ascii.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/term_ascii.c b/term_ascii.c index af1fade9..f1db4c5a 100644 --- a/term_ascii.c +++ b/term_ascii.c @@ -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"; @@ -127,6 +131,14 @@ ascii_alloc(char *outopts) } void * +utf8_alloc(char *outopts) +{ + + return(ascii_init(TERMENC_UTF8, outopts)); +} + + +void * locale_alloc(char *outopts) { |