X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Funiwidth%2Fwidth.c;h=d33cd890b985fb95cef75bf59abaef3ff5876dbc;hb=fa43e0af674cf072f407fda6ec95cae536f4e4a0;hp=25ff0c73f25844f774ce14de75e9411d88eabeae;hpb=3977c2385eb872f0a9e3519ed32c811605742b19;p=gnulib.git

diff --git a/lib/uniwidth/width.c b/lib/uniwidth/width.c
index 25ff0c73f..d33cd890b 100644
--- a/lib/uniwidth/width.c
+++ b/lib/uniwidth/width.c
@@ -1,5 +1,5 @@
 /* Determine display width of Unicode character.
-   Copyright (C) 2001-2002, 2006-2009 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006-2011 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
@@ -310,44 +310,44 @@ uc_width (ucs4_t uc, const char *encoding)
     {
       int ind = nonspacing_table_ind[uc >> 9];
       if (ind >= 0)
-	if ((nonspacing_table_data[64*ind + ((uc >> 3) & 63)] >> (uc & 7)) & 1)
-	  {
-	    if (uc > 0 && uc < 0xa0)
-	      return -1;
-	    else
-	      return 0;
-	  }
+        if ((nonspacing_table_data[64*ind + ((uc >> 3) & 63)] >> (uc & 7)) & 1)
+          {
+            if (uc > 0 && uc < 0xa0)
+              return -1;
+            else
+              return 0;
+          }
     }
   else if ((uc >> 9) == (0xe0000 >> 9))
     {
       if (uc >= 0xe0100)
-	{
-	  if (uc <= 0xe01ef)
-	    return 0;
-	}
+        {
+          if (uc <= 0xe01ef)
+            return 0;
+        }
       else
-	{
-	  if (uc >= 0xe0020 ? uc <= 0xe007f : uc == 0xe0001)
-	    return 0;
-	}
+        {
+          if (uc >= 0xe0020 ? uc <= 0xe007f : uc == 0xe0001)
+            return 0;
+        }
     }
   /* Test for double-width character.
-   * Generated from "grep '^....;[WF]' EastAsianWidth.txt"
-   * and            "grep '^....;[^WF]' EastAsianWidth.txt"
+   * Generated from "grep '^[^;]\{4,5\};[WF]' EastAsianWidth.txt"
+   * and            "grep '^[^;]\{4,5\};[^WF]' EastAsianWidth.txt"
    */
   if (uc >= 0x1100
       && ((uc < 0x1160) /* Hangul Jamo */
-	  || (uc >= 0x2329 && uc < 0x232b) /* Angle Brackets */
-	  || (uc >= 0x2e80 && uc < 0xa4d0  /* CJK ... Yi */
-	      && !(uc == 0x303f) && !(uc >= 0x4dc0 && uc < 0x4e00))
-	  || (uc >= 0xac00 && uc < 0xd7a4) /* Hangul Syllables */
-	  || (uc >= 0xf900 && uc < 0xfb00) /* CJK Compatibility Ideographs */
-	  || (uc >= 0xfe10 && uc < 0xfe20) /* Presentation Forms for Vertical */
-	  || (uc >= 0xfe30 && uc < 0xfe70) /* CJK Compatibility Forms */
-	  || (uc >= 0xff00 && uc < 0xff61) /* Fullwidth Forms */
-	  || (uc >= 0xffe0 && uc < 0xffe7) /* Fullwidth Signs */
-	  || (uc >= 0x20000 && uc <= 0x2a6d6) /* CJK */
-	  || (uc >= 0x2f800 && uc <= 0x2fa1d) /* CJK Compatibility Ideographs */
+          || (uc >= 0x2329 && uc < 0x232b) /* Angle Brackets */
+          || (uc >= 0x2e80 && uc < 0xa4d0  /* CJK ... Yi */
+              && !(uc == 0x303f) && !(uc >= 0x4dc0 && uc < 0x4e00))
+          || (uc >= 0xac00 && uc < 0xd7a4) /* Hangul Syllables */
+          || (uc >= 0xf900 && uc < 0xfb00) /* CJK Compatibility Ideographs */
+          || (uc >= 0xfe10 && uc < 0xfe20) /* Presentation Forms for Vertical */
+          || (uc >= 0xfe30 && uc < 0xfe70) /* CJK Compatibility Forms */
+          || (uc >= 0xff00 && uc < 0xff61) /* Fullwidth Forms */
+          || (uc >= 0xffe0 && uc < 0xffe7) /* Fullwidth Signs */
+          || (uc >= 0x20000 && uc <= 0x2a6d6) /* CJK */
+          || (uc >= 0x2f800 && uc <= 0x2fa1d) /* CJK Compatibility Ideographs */
      )   )
     return 2;
   /* In ancient CJK encodings, Cyrillic and most other characters are