=================================================================== RCS file: /cvs/mandoc/term_ascii.c,v retrieving revision 1.15 retrieving revision 1.18 diff -u -p -r1.15 -r1.18 --- mandoc/term_ascii.c 2011/05/17 22:32:45 1.15 +++ mandoc/term_ascii.c 2011/09/18 14:14:15 1.18 @@ -1,6 +1,6 @@ -/* $Id: term_ascii.c,v 1.15 2011/05/17 22:32:45 kristaps Exp $ */ +/* $Id: term_ascii.c,v 1.18 2011/09/18 14:14:15 schwarze Exp $ */ /* - * Copyright (c) 2010 Kristaps Dzonsons + * Copyright (c) 2010, 2011 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -37,9 +37,16 @@ #include "term.h" #include "main.h" +/* + * Sadly, this doesn't seem to be defined on systems even when they + * support it. For the time being, remove it and let those compiling + * the software decide for themselves what to use. + */ +#if 0 #if ! defined(__STDC_ISO_10646__) # undef USE_WCHAR #endif +#endif static struct termp *ascii_init(enum termenc, char *); static double ascii_hspan(const struct termp *, @@ -82,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"; @@ -118,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)