[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.15 and 1.18

version 1.15, 2011/05/17 22:32:45 version 1.18, 2011/09/18 14:14:15
Line 1 
Line 1 
 /*      $Id$ */  /*      $Id$ */
 /*  /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>   * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *   *
  * 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 37 
Line 37 
 #include "term.h"  #include "term.h"
 #include "main.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__)  #if ! defined(__STDC_ISO_10646__)
 # undef USE_WCHAR  # undef USE_WCHAR
 #endif  #endif
   #endif
   
 static  struct termp     *ascii_init(enum termenc, char *);  static  struct termp     *ascii_init(enum termenc, char *);
 static  double            ascii_hspan(const struct termp *,  static  double            ascii_hspan(const struct termp *,
Line 82  ascii_init(enum termenc enc, char *outopts)
Line 89  ascii_init(enum termenc enc, char *outopts)
         p->letter = ascii_letter;          p->letter = ascii_letter;
         p->width = ascii_width;          p->width = ascii_width;
   
 #if defined (USE_WCHAR)  #ifdef  USE_WCHAR
         if (TERMENC_LOCALE == enc)          if (TERMENC_ASCII != enc) {
                 if (setlocale(LC_ALL, "") && MB_CUR_MAX > 1) {                  v = TERMENC_LOCALE == enc ?
                           setlocale(LC_ALL, "") :
                           setlocale(LC_CTYPE, "UTF-8");
                   if (NULL != v && 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;
                         p->letter = locale_letter;                          p->letter = locale_letter;
                         p->width = locale_width;                          p->width = locale_width;
                 }                  }
           }
 #endif  #endif
   
         toks[0] = "width";          toks[0] = "width";
Line 118  ascii_alloc(char *outopts)
Line 129  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 *  void *
 locale_alloc(char *outopts)  locale_alloc(char *outopts)
Legend:
Removed from v.1.15  
changed lines
  Added in v.1.18
CVSweb