[BACK]Return to term_ascii.c CVS log [TXT][DIR] Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/term_ascii.c between version 1.59 and 1.60

version 1.59, 2017/08/23 10:50:15 version 1.60, 2018/04/13 18:31:00
Line 1 
Line 1 
 /*      $Id$ */  /*      $Id$ */
 /*  /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>   * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>   * Copyright (c) 2014, 2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
  *   *
  * Permission to use, copy, modify, and distribute this software for any   * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above   * purpose with or without fee is hereby granted, provided that the above
Line 21 
Line 21 
   
 #include <assert.h>  #include <assert.h>
 #if HAVE_WCHAR  #if HAVE_WCHAR
   #include <langinfo.h>
 #include <locale.h>  #include <locale.h>
 #endif  #endif
 #include <stdint.h>  #include <stdint.h>
 #include <stdio.h>  #include <stdio.h>
 #include <stdlib.h>  #include <stdlib.h>
   #include <string.h>
 #include <unistd.h>  #include <unistd.h>
 #if HAVE_WCHAR  #if HAVE_WCHAR
 #include <wchar.h>  #include <wchar.h>
Line 100  ascii_init(enum termenc enc, const struct manoutput *o
Line 102  ascii_init(enum termenc enc, const struct manoutput *o
                 v = TERMENC_LOCALE == enc ?                  v = TERMENC_LOCALE == enc ?
                     setlocale(LC_CTYPE, "") :                      setlocale(LC_CTYPE, "") :
                     setlocale(LC_CTYPE, UTF8_LOCALE);                      setlocale(LC_CTYPE, UTF8_LOCALE);
                 if (NULL != v && MB_CUR_MAX > 1) {  
                   /*
                    * We only support UTF-8,
                    * so revert to ASCII for anything else.
                    */
   
                   if (v != NULL &&
                       strcmp(nl_langinfo(CODESET), "UTF-8") != 0)
                           v = setlocale(LC_CTYPE, "C");
   
                   if (v != NULL && MB_CUR_MAX > 1) {
                         p->enc = enc;                          p->enc = enc;
                         p->advance = locale_advance;                          p->advance = locale_advance;
                         p->endline = locale_endline;                          p->endline = locale_endline;
Legend:
Removed from v.1.59  
changed lines
  Added in v.1.60
CVSweb