5051 import mdocml-1.12.3
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Approved by: TBD

*** 1,6 ****
! /*      $Id: term_ascii.c,v 1.20 2011/12/04 23:10:52 schwarze Exp $ */
  /*
   * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   *
   * Permission to use, copy, modify, and distribute this software for any
   * purpose with or without fee is hereby granted, provided that the above
--- 1,6 ----
! /*      $Id: term_ascii.c,v 1.21 2013/06/01 14:27:20 schwarze Exp $ */
  /*
   * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   *
   * Permission to use, copy, modify, and distribute this software for any
   * purpose with or without fee is hereby granted, provided that the above
*** 71,81 ****
          const char      *toks[4];
          char            *v;
          struct termp    *p;
  
          p = mandoc_calloc(1, sizeof(struct termp));
-         p->enc = enc;
  
          p->tabwidth = 5;
          p->defrmargin = 78;
  
          p->begin = ascii_begin;
--- 71,80 ----
*** 91,101 ****
  
  #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;
--- 90,100 ----
  
  #ifdef  USE_WCHAR
          if (TERMENC_ASCII != enc) {
                  v = TERMENC_LOCALE == enc ?
                          setlocale(LC_ALL, "") :
!                         setlocale(LC_CTYPE, "en_US.UTF-8");
                  if (NULL != v && MB_CUR_MAX > 1) {
                          p->enc = enc;
                          p->advance = locale_advance;
                          p->endline = locale_endline;
                          p->letter = locale_letter;