Imported Upstream version 0.9.3upstream/0.9.3

156 files changed, 505 insertions, 505 deletions

diff --git a/lib/unictype/bidi_byname.c b/lib/unictype/bidi_byname.c
index 8a6cb71a..868f05dc 100644
--- a/lib/unictype/bidi_byname.c
+++ b/lib/unictype/bidi_byname.c
@@ -1,5 +1,5 @@
 /* Bidi categories of Unicode characters.
-   Copyright (C) 2002, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, 2009-2010 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
@@ -27,143 +27,143 @@ uc_bidi_category_byname (const char *category_name)
     {
     case 'A':
       switch (category_name[1])
-	{
-	case 'L':
-	  if (category_name[2] == '\0')
-	    return UC_BIDI_AL;
-	  break;
-	case 'N':
-	  if (category_name[2] == '\0')
-	    return UC_BIDI_AN;
-	  break;
-	}
+        {
+        case 'L':
+          if (category_name[2] == '\0')
+            return UC_BIDI_AL;
+          break;
+        case 'N':
+          if (category_name[2] == '\0')
+            return UC_BIDI_AN;
+          break;
+        }
       break;
     case 'B':
       switch (category_name[1])
-	{
-	case '\0':
-	  return UC_BIDI_B;
-	case 'N':
-	  if (category_name[2] == '\0')
-	    return UC_BIDI_BN;
-	  break;
-	}
+        {
+        case '\0':
+          return UC_BIDI_B;
+        case 'N':
+          if (category_name[2] == '\0')
+            return UC_BIDI_BN;
+          break;
+        }
       break;
     case 'C':
       switch (category_name[1])
-	{
-	case 'S':
-	  if (category_name[2] == '\0')
-	    return UC_BIDI_CS;
-	  break;
-	}
+        {
+        case 'S':
+          if (category_name[2] == '\0')
+            return UC_BIDI_CS;
+          break;
+        }
       break;
     case 'E':
       switch (category_name[1])
-	{
-	case 'N':
-	  if (category_name[2] == '\0')
-	    return UC_BIDI_EN;
-	  break;
-	case 'S':
-	  if (category_name[2] == '\0')
-	    return UC_BIDI_ES;
-	  break;
-	case 'T':
-	  if (category_name[2] == '\0')
-	    return UC_BIDI_ET;
-	  break;
-	}
+        {
+        case 'N':
+          if (category_name[2] == '\0')
+            return UC_BIDI_EN;
+          break;
+        case 'S':
+          if (category_name[2] == '\0')
+            return UC_BIDI_ES;
+          break;
+        case 'T':
+          if (category_name[2] == '\0')
+            return UC_BIDI_ET;
+          break;
+        }
       break;
     case 'L':
       switch (category_name[1])
-	{
-	case '\0':
-	  return UC_BIDI_L;
-	case 'R':
-	  switch (category_name[2])
-	    {
-	    case 'E':
-	      if (category_name[3] == '\0')
-		return UC_BIDI_LRE;
-	      break;
-	    case 'O':
-	      if (category_name[3] == '\0')
-		return UC_BIDI_LRO;
-	      break;
-	    }
-	  break;
-	}
+        {
+        case '\0':
+          return UC_BIDI_L;
+        case 'R':
+          switch (category_name[2])
+            {
+            case 'E':
+              if (category_name[3] == '\0')
+                return UC_BIDI_LRE;
+              break;
+            case 'O':
+              if (category_name[3] == '\0')
+                return UC_BIDI_LRO;
+              break;
+            }
+          break;
+        }
       break;
     case 'N':
       switch (category_name[1])
-	{
-	case 'S':
-	  switch (category_name[2])
-	    {
-	    case 'M':
-	      if (category_name[3] == '\0')
-		return UC_BIDI_NSM;
-	      break;
-	    }
-	  break;
-	}
+        {
+        case 'S':
+          switch (category_name[2])
+            {
+            case 'M':
+              if (category_name[3] == '\0')
+                return UC_BIDI_NSM;
+              break;
+            }
+          break;
+        }
       break;
     case 'O':
       switch (category_name[1])
-	{
-	case 'N':
-	  if (category_name[2] == '\0')
-	    return UC_BIDI_ON;
-	  break;
-	}
+        {
+        case 'N':
+          if (category_name[2] == '\0')
+            return UC_BIDI_ON;
+          break;
+        }
       break;
     case 'P':
       switch (category_name[1])
-	{
-	case 'D':
-	  switch (category_name[2])
-	    {
-	    case 'F':
-	      if (category_name[3] == '\0')
-		return UC_BIDI_PDF;
-	      break;
-	    }
-	  break;
-	}
+        {
+        case 'D':
+          switch (category_name[2])
+            {
+            case 'F':
+              if (category_name[3] == '\0')
+                return UC_BIDI_PDF;
+              break;
+            }
+          break;
+        }
       break;
     case 'R':
       switch (category_name[1])
-	{
-	case '\0':
-	  return UC_BIDI_R;
-	case 'L':
-	  switch (category_name[2])
-	    {
-	    case 'E':
-	      if (category_name[3] == '\0')
-		return UC_BIDI_RLE;
-	      break;
-	    case 'O':
-	      if (category_name[3] == '\0')
-		return UC_BIDI_RLO;
-	      break;
-	    }
-	  break;
-	}
+        {
+        case '\0':
+          return UC_BIDI_R;
+        case 'L':
+          switch (category_name[2])
+            {
+            case 'E':
+              if (category_name[3] == '\0')
+                return UC_BIDI_RLE;
+              break;
+            case 'O':
+              if (category_name[3] == '\0')
+                return UC_BIDI_RLO;
+              break;
+            }
+          break;
+        }
       break;
     case 'S':
       if (category_name[1] == '\0')
-	return UC_BIDI_S;
+        return UC_BIDI_S;
       break;
     case 'W':
       switch (category_name[1])
-	{
-	case 'S':
-	  if (category_name[2] == '\0')
-	    return UC_BIDI_WS;
-	  break;
-	}
+        {
+        case 'S':
+          if (category_name[2] == '\0')
+            return UC_BIDI_WS;
+          break;
+        }
       break;
     }
   /* Invalid category name.  */
diff --git a/lib/unictype/bidi_name.c b/lib/unictype/bidi_name.c
index 76529768..28bb4baa 100644
--- a/lib/unictype/bidi_name.c
+++ b/lib/unictype/bidi_name.c
@@ -1,5 +1,5 @@
 /* Bidi categories of Unicode characters.
-   Copyright (C) 2002, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, 2009-2010 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
diff --git a/lib/unictype/bidi_of.c b/lib/unictype/bidi_of.c
index 93fc7a8b..4a293a87 100644
--- a/lib/unictype/bidi_of.c
+++ b/lib/unictype/bidi_of.c
@@ -1,5 +1,5 @@
 /* Bidi categories of Unicode characters.
-   Copyright (C) 2002, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, 2009-2010 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
@@ -31,22 +31,22 @@ uc_bidi_category (ucs4_t uc)
     {
       int lookup1 = u_bidi_category.level1[index1];
       if (lookup1 >= 0)
-	{
-	  unsigned int index2 = (uc >> bidi_category_header_2) & bidi_category_header_3;
-	  int lookup2 = u_bidi_category.level2[lookup1 + index2];
-	  if (lookup2 >= 0)
-	    {
-	      unsigned int index3 = ((uc & bidi_category_header_4) + lookup2) * 5;
-	      /* level3 contains 5-bit values, packed into 16-bit words.  */
-	      unsigned int lookup3 =
-		((u_bidi_category.level3[index3>>4]
-		  | (u_bidi_category.level3[(index3>>4)+1] << 16))
-		 >> (index3 % 16))
-		& 0x1f;
-
-	      return lookup3;
-	    }
-	}
+        {
+          unsigned int index2 = (uc >> bidi_category_header_2) & bidi_category_header_3;
+          int lookup2 = u_bidi_category.level2[lookup1 + index2];
+          if (lookup2 >= 0)
+            {
+              unsigned int index3 = ((uc & bidi_category_header_4) + lookup2) * 5;
+              /* level3 contains 5-bit values, packed into 16-bit words.  */
+              unsigned int lookup3 =
+                ((u_bidi_category.level3[index3>>4]
+                  | (u_bidi_category.level3[(index3>>4)+1] << 16))
+                 >> (index3 % 16))
+                & 0x1f;
+
+              return lookup3;
+            }
+        }
     }
   return UC_BIDI_L;
 }
diff --git a/lib/unictype/bidi_test.c b/lib/unictype/bidi_test.c
index 72887bbc..0a9fa5c9 100644
--- a/lib/unictype/bidi_test.c
+++ b/lib/unictype/bidi_test.c
@@ -1,5 +1,5 @@
 /* Bidi categories of Unicode characters.
-   Copyright (C) 2002, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, 2009-2010 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
diff --git a/lib/unictype/bitmap.h b/lib/unictype/bitmap.h
index 280b2985..4e743c5e 100644
--- a/lib/unictype/bitmap.h
+++ b/lib/unictype/bitmap.h
@@ -1,5 +1,5 @@
 /* Three-level bitmap lookup.
-   Copyright (C) 2000-2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 2000-2002, 2005-2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2000-2002.
 
    This program is free software: you can redistribute it and/or modify it
@@ -31,17 +31,17 @@ bitmap_lookup (const void *table, ucs4_t uc)
     {
       int lookup1 = ((const int *) table)[1 + index1];
       if (lookup1 >= 0)
-	{
-	  unsigned int index2 = (uc >> header_2) & header_3;
-	  int lookup2 = ((const short *) table)[lookup1 + index2];
-	  if (lookup2 >= 0)
-	    {
-	      unsigned int index3 = (uc >> 5) & header_4;
-	      unsigned int lookup3 = ((const int *) table)[lookup2 + index3];
+        {
+          unsigned int index2 = (uc >> header_2) & header_3;
+          int lookup2 = ((const short *) table)[lookup1 + index2];
+          if (lookup2 >= 0)
+            {
+              unsigned int index3 = (uc >> 5) & header_4;
+              unsigned int lookup3 = ((const int *) table)[lookup2 + index3];
 
-	      return (lookup3 >> (uc & 0x1f)) & 1;
-	    }
-	}
+              return (lookup3 >> (uc & 0x1f)) & 1;
+            }
+        }
     }
   return 0;
 }
diff --git a/lib/unictype/block_test.c b/lib/unictype/block_test.c
index 4005ad04..04722b49 100644
--- a/lib/unictype/block_test.c
+++ b/lib/unictype/block_test.c
@@ -1,5 +1,5 @@
 /* Blocks of Unicode characters.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/lib/unictype/blocks.c b/lib/unictype/blocks.c
index a20bbcee..e83e5469 100644
--- a/lib/unictype/blocks.c
+++ b/lib/unictype/blocks.c
@@ -1,5 +1,5 @@
 /* Blocks of Unicode characters.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This program is free software: you can redistribute it and/or modify it
@@ -45,11 +45,11 @@ uc_block (ucs4_t uc)
     {
       unsigned int mid_index = (first_index + last_index) / 2;
       if (blocks[mid_index].end < uc)
-	first_index = mid_index + 1;
+        first_index = mid_index + 1;
       else if (uc < blocks[mid_index].start)
-	last_index = mid_index;
+        last_index = mid_index;
       else
-	return &blocks[mid_index];
+        return &blocks[mid_index];
     }
   return NULL;
 }
diff --git a/lib/unictype/categ_C.c b/lib/unictype/categ_C.c
index d14d8c09..3c3860df 100644
--- a/lib/unictype/categ_C.c
+++ b/lib/unictype/categ_C.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_Cc.c b/lib/unictype/categ_Cc.c
index 572f88f7..653848db 100644
--- a/lib/unictype/categ_Cc.c
+++ b/lib/unictype/categ_Cc.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_Cf.c b/lib/unictype/categ_Cf.c
index 19cd842e..fd53e7a8 100644
--- a/lib/unictype/categ_Cf.c
+++ b/lib/unictype/categ_Cf.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_Cn.c b/lib/unictype/categ_Cn.c
index 131704ab..63242dc0 100644
--- a/lib/unictype/categ_Cn.c
+++ b/lib/unictype/categ_Cn.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_Co.c b/lib/unictype/categ_Co.c
index 70b5ac72..3452a17e 100644
--- a/lib/unictype/categ_Co.c
+++ b/lib/unictype/categ_Co.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_Cs.c b/lib/unictype/categ_Cs.c
index a3f5ceab..cd94733d 100644
--- a/lib/unictype/categ_Cs.c
+++ b/lib/unictype/categ_Cs.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_L.c b/lib/unictype/categ_L.c
index b62b2a27..4b7f16d8 100644
--- a/lib/unictype/categ_L.c
+++ b/lib/unictype/categ_L.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_Ll.c b/lib/unictype/categ_Ll.c
index 37da1a08..e7e752ef 100644
--- a/lib/unictype/categ_Ll.c
+++ b/lib/unictype/categ_Ll.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_Lm.c b/lib/unictype/categ_Lm.c
index 296e53db..fc016026 100644
--- a/lib/unictype/categ_Lm.c
+++ b/lib/unictype/categ_Lm.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_Lo.c b/lib/unictype/categ_Lo.c
index 5c7781e1..57ae6116 100644
--- a/lib/unictype/categ_Lo.c
+++ b/lib/unictype/categ_Lo.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_Lt.c b/lib/unictype/categ_Lt.c
index 485acf66..9de263d7 100644
--- a/lib/unictype/categ_Lt.c
+++ b/lib/unictype/categ_Lt.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_Lu.c b/lib/unictype/categ_Lu.c
index 26faae27..6000421b 100644
--- a/lib/unictype/categ_Lu.c
+++ b/lib/unictype/categ_Lu.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_M.c b/lib/unictype/categ_M.c
index ab7f149c..8e6ff700 100644
--- a/lib/unictype/categ_M.c
+++ b/lib/unictype/categ_M.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_Mc.c b/lib/unictype/categ_Mc.c
index c54a565c..f4cca6bd 100644
--- a/lib/unictype/categ_Mc.c
+++ b/lib/unictype/categ_Mc.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_Me.c b/lib/unictype/categ_Me.c
index 00e2a012..62b1ad9a 100644
--- a/lib/unictype/categ_Me.c
+++ b/lib/unictype/categ_Me.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_Mn.c b/lib/unictype/categ_Mn.c
index 5990ee50..edcf3c50 100644
--- a/lib/unictype/categ_Mn.c
+++ b/lib/unictype/categ_Mn.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_N.c b/lib/unictype/categ_N.c
index 5aa92487..e326ff22 100644
--- a/lib/unictype/categ_N.c
+++ b/lib/unictype/categ_N.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_Nd.c b/lib/unictype/categ_Nd.c
index f5ad3224..c6b02580 100644
--- a/lib/unictype/categ_Nd.c
+++ b/lib/unictype/categ_Nd.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_Nl.c b/lib/unictype/categ_Nl.c
index 6fe93707..50a39bb0 100644
--- a/lib/unictype/categ_Nl.c
+++ b/lib/unictype/categ_Nl.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_No.c b/lib/unictype/categ_No.c
index 055177f6..f36899d7 100644
--- a/lib/unictype/categ_No.c
+++ b/lib/unictype/categ_No.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_P.c b/lib/unictype/categ_P.c
index e1dbbcdd..14f94ad4 100644
--- a/lib/unictype/categ_P.c
+++ b/lib/unictype/categ_P.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_Pc.c b/lib/unictype/categ_Pc.c
index 06558ada..a0c9ff81 100644
--- a/lib/unictype/categ_Pc.c
+++ b/lib/unictype/categ_Pc.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_Pd.c b/lib/unictype/categ_Pd.c
index 96516d59..8e666338 100644
--- a/lib/unictype/categ_Pd.c
+++ b/lib/unictype/categ_Pd.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_Pe.c b/lib/unictype/categ_Pe.c
index 53155325..f911f38a 100644
--- a/lib/unictype/categ_Pe.c
+++ b/lib/unictype/categ_Pe.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_Pf.c b/lib/unictype/categ_Pf.c
index 435e19f1..c49b52be 100644
--- a/lib/unictype/categ_Pf.c
+++ b/lib/unictype/categ_Pf.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_Pi.c b/lib/unictype/categ_Pi.c
index 9ea1de1d..bf555000 100644
--- a/lib/unictype/categ_Pi.c
+++ b/lib/unictype/categ_Pi.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_Po.c b/lib/unictype/categ_Po.c
index 4c2e2cb1..71cc4b0c 100644
--- a/lib/unictype/categ_Po.c
+++ b/lib/unictype/categ_Po.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_Ps.c b/lib/unictype/categ_Ps.c
index 4e10039d..ce49d393 100644
--- a/lib/unictype/categ_Ps.c
+++ b/lib/unictype/categ_Ps.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_S.c b/lib/unictype/categ_S.c
index 4eb51f5f..1661bb25 100644
--- a/lib/unictype/categ_S.c
+++ b/lib/unictype/categ_S.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_Sc.c b/lib/unictype/categ_Sc.c
index 171d5b81..f5933fa5 100644
--- a/lib/unictype/categ_Sc.c
+++ b/lib/unictype/categ_Sc.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_Sk.c b/lib/unictype/categ_Sk.c
index 5f4d84e6..3ff45524 100644
--- a/lib/unictype/categ_Sk.c
+++ b/lib/unictype/categ_Sk.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_Sm.c b/lib/unictype/categ_Sm.c
index 158823fd..f1f09f10 100644
--- a/lib/unictype/categ_Sm.c
+++ b/lib/unictype/categ_Sm.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_So.c b/lib/unictype/categ_So.c
index a1f688b5..691dcc2f 100644
--- a/lib/unictype/categ_So.c
+++ b/lib/unictype/categ_So.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_Z.c b/lib/unictype/categ_Z.c
index eb187d63..569d82a9 100644
--- a/lib/unictype/categ_Z.c
+++ b/lib/unictype/categ_Z.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_Zl.c b/lib/unictype/categ_Zl.c
index 4a6e3df3..58b075ec 100644
--- a/lib/unictype/categ_Zl.c
+++ b/lib/unictype/categ_Zl.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_Zp.c b/lib/unictype/categ_Zp.c
index 23f682cd..3cc8c6c4 100644
--- a/lib/unictype/categ_Zp.c
+++ b/lib/unictype/categ_Zp.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_Zs.c b/lib/unictype/categ_Zs.c
index c9971577..b4cfed6f 100644
--- a/lib/unictype/categ_Zs.c
+++ b/lib/unictype/categ_Zs.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/categ_and.c b/lib/unictype/categ_and.c
index 2101f94e..67a06fa4 100644
--- a/lib/unictype/categ_and.c
+++ b/lib/unictype/categ_and.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This program is free software: you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
 
 uc_general_category_t
 uc_general_category_and (uc_general_category_t category1,
-			 uc_general_category_t category2)
+                         uc_general_category_t category2)
 {
   uint32_t bitmask;
   uc_general_category_t result;
diff --git a/lib/unictype/categ_and_not.c b/lib/unictype/categ_and_not.c
index 6cc27596..b550cccc 100644
--- a/lib/unictype/categ_and_not.c
+++ b/lib/unictype/categ_and_not.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This program is free software: you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
 
 uc_general_category_t
 uc_general_category_and_not (uc_general_category_t category1,
-			     uc_general_category_t category2)
+                             uc_general_category_t category2)
 {
   uint32_t bitmask;
   uc_general_category_t result;
diff --git a/lib/unictype/categ_byname.c b/lib/unictype/categ_byname.c
index a175dd15..fb75b675 100644
--- a/lib/unictype/categ_byname.c
+++ b/lib/unictype/categ_byname.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
@@ -28,77 +28,77 @@ uc_general_category_byname (const char *category_name)
     switch (category_name[0])
       {
       case 'L':
-	switch (category_name[1])
-	  {
-	  case '\0': return UC_CATEGORY_L;
-	  case 'u': return UC_CATEGORY_Lu;
-	  case 'l': return UC_CATEGORY_Ll;
-	  case 't': return UC_CATEGORY_Lt;
-	  case 'm': return UC_CATEGORY_Lm;
-	  case 'o': return UC_CATEGORY_Lo;
-	  }
-	break;
+        switch (category_name[1])
+          {
+          case '\0': return UC_CATEGORY_L;
+          case 'u': return UC_CATEGORY_Lu;
+          case 'l': return UC_CATEGORY_Ll;
+          case 't': return UC_CATEGORY_Lt;
+          case 'm': return UC_CATEGORY_Lm;
+          case 'o': return UC_CATEGORY_Lo;
+          }
+        break;
       case 'M':
-	switch (category_name[1])
-	  {
-	  case '\0': return UC_CATEGORY_M;
-	  case 'n': return UC_CATEGORY_Mn;
-	  case 'c': return UC_CATEGORY_Mc;
-	  case 'e': return UC_CATEGORY_Me;
-	  }
-	break;
+        switch (category_name[1])
+          {
+          case '\0': return UC_CATEGORY_M;
+          case 'n': return UC_CATEGORY_Mn;
+          case 'c': return UC_CATEGORY_Mc;
+          case 'e': return UC_CATEGORY_Me;
+          }
+        break;
       case 'N':
-	switch (category_name[1])
-	  {
-	  case '\0': return UC_CATEGORY_N;
-	  case 'd': return UC_CATEGORY_Nd;
-	  case 'l': return UC_CATEGORY_Nl;
-	  case 'o': return UC_CATEGORY_No;
-	  }
-	break;
+        switch (category_name[1])
+          {
+          case '\0': return UC_CATEGORY_N;
+          case 'd': return UC_CATEGORY_Nd;
+          case 'l': return UC_CATEGORY_Nl;
+          case 'o': return UC_CATEGORY_No;
+          }
+        break;
       case 'P':
-	switch (category_name[1])
-	  {
-	  case '\0': return UC_CATEGORY_P;
-	  case 'c': return UC_CATEGORY_Pc;
-	  case 'd': return UC_CATEGORY_Pd;
-	  case 's': return UC_CATEGORY_Ps;
-	  case 'e': return UC_CATEGORY_Pe;
-	  case 'i': return UC_CATEGORY_Pi;
-	  case 'f': return UC_CATEGORY_Pf;
-	  case 'o': return UC_CATEGORY_Po;
-	  }
-	break;
+        switch (category_name[1])
+          {
+          case '\0': return UC_CATEGORY_P;
+          case 'c': return UC_CATEGORY_Pc;
+          case 'd': return UC_CATEGORY_Pd;
+          case 's': return UC_CATEGORY_Ps;
+          case 'e': return UC_CATEGORY_Pe;
+          case 'i': return UC_CATEGORY_Pi;
+          case 'f': return UC_CATEGORY_Pf;
+          case 'o': return UC_CATEGORY_Po;
+          }
+        break;
       case 'S':
-	switch (category_name[1])
-	  {
-	  case '\0': return UC_CATEGORY_S;
-	  case 'm': return UC_CATEGORY_Sm;
-	  case 'c': return UC_CATEGORY_Sc;
-	  case 'k': return UC_CATEGORY_Sk;
-	  case 'o': return UC_CATEGORY_So;
-	  }
-	break;
+        switch (category_name[1])
+          {
+          case '\0': return UC_CATEGORY_S;
+          case 'm': return UC_CATEGORY_Sm;
+          case 'c': return UC_CATEGORY_Sc;
+          case 'k': return UC_CATEGORY_Sk;
+          case 'o': return UC_CATEGORY_So;
+          }
+        break;
       case 'Z':
-	switch (category_name[1])
-	  {
-	  case '\0': return UC_CATEGORY_Z;
-	  case 's': return UC_CATEGORY_Zs;
-	  case 'l': return UC_CATEGORY_Zl;
-	  case 'p': return UC_CATEGORY_Zp;
-	  }
-	break;
+        switch (category_name[1])
+          {
+          case '\0': return UC_CATEGORY_Z;
+          case 's': return UC_CATEGORY_Zs;
+          case 'l': return UC_CATEGORY_Zl;
+          case 'p': return UC_CATEGORY_Zp;
+          }
+        break;
       case 'C':
-	switch (category_name[1])
-	  {
-	  case '\0': return UC_CATEGORY_C;
-	  case 'c': return UC_CATEGORY_Cc;
-	  case 'f': return UC_CATEGORY_Cf;
-	  case 's': return UC_CATEGORY_Cs;
-	  case 'o': return UC_CATEGORY_Co;
-	  case 'n': return UC_CATEGORY_Cn;
-	  }
-	break;
+        switch (category_name[1])
+          {
+          case '\0': return UC_CATEGORY_C;
+          case 'c': return UC_CATEGORY_Cc;
+          case 'f': return UC_CATEGORY_Cf;
+          case 's': return UC_CATEGORY_Cs;
+          case 'o': return UC_CATEGORY_Co;
+          case 'n': return UC_CATEGORY_Cn;
+          }
+        break;
       }
   /* Invalid category name.  */
   return _UC_CATEGORY_NONE;
diff --git a/lib/unictype/categ_name.c b/lib/unictype/categ_name.c
index 10421efc..1243e2f0 100644
--- a/lib/unictype/categ_name.c
+++ b/lib/unictype/categ_name.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
@@ -35,43 +35,43 @@ uc_general_category_name (uc_general_category_t category)
   if (bitmask != 0)
     {
       if ((bitmask & (bitmask - 1)) == 0)
-	{
-	  int bit;
-	  /* Take log2 using a variant of Robert Harley's method.
-	     Found by Bruno Haible 1996.  */
-	  uint32_t n = bitmask;
-	  static const char ord2_tab[64] =
-	    {
-	      -1,  0,  1, 12,  2,  6, -1, 13,  3, -1,  7, -1, -1, -1, -1, 14,
-	      10,  4, -1, -1,  8, -1, -1, 25, -1, -1, -1, -1, -1, 21, 27, 15,
-	      31, 11,  5, -1, -1, -1, -1, -1,  9, -1, -1, 24, -1, -1, 20, 26,
-	      30, -1, -1, -1, -1, 23, -1, 19, 29, -1, 22, 18, 28, 17, 16, -1
-	    };
-	  n += n << 4;
-	  n += n << 6;
-	  n = (n << 16) - n;
-	  bit = ord2_tab[n >> 26];
+        {
+          int bit;
+          /* Take log2 using a variant of Robert Harley's method.
+             Found by Bruno Haible 1996.  */
+          uint32_t n = bitmask;
+          static const char ord2_tab[64] =
+            {
+              -1,  0,  1, 12,  2,  6, -1, 13,  3, -1,  7, -1, -1, -1, -1, 14,
+              10,  4, -1, -1,  8, -1, -1, 25, -1, -1, -1, -1, -1, 21, 27, 15,
+              31, 11,  5, -1, -1, -1, -1, -1,  9, -1, -1, 24, -1, -1, 20, 26,
+              30, -1, -1, -1, -1, 23, -1, 19, 29, -1, 22, 18, 28, 17, 16, -1
+            };
+          n += n << 4;
+          n += n << 6;
+          n = (n << 16) - n;
+          bit = ord2_tab[n >> 26];
 
-	  if (bit < sizeof (u_category_name) / sizeof (u_category_name[0]))
-	    return u_category_name[bit];
-	}
+          if (bit < sizeof (u_category_name) / sizeof (u_category_name[0]))
+            return u_category_name[bit];
+        }
       else
-	{
-	  if (bitmask == UC_CATEGORY_MASK_L)
-	    return "L";
-	  if (bitmask == UC_CATEGORY_MASK_M)
-	    return "M";
-	  if (bitmask == UC_CATEGORY_MASK_N)
-	    return "N";
-	  if (bitmask == UC_CATEGORY_MASK_P)
-	    return "P";
-	  if (bitmask == UC_CATEGORY_MASK_S)
-	    return "S";
-	  if (bitmask == UC_CATEGORY_MASK_Z)
-	    return "Z";
-	  if (bitmask == UC_CATEGORY_MASK_C)
-	    return "C";
-	}
+        {
+          if (bitmask == UC_CATEGORY_MASK_L)
+            return "L";
+          if (bitmask == UC_CATEGORY_MASK_M)
+            return "M";
+          if (bitmask == UC_CATEGORY_MASK_N)
+            return "N";
+          if (bitmask == UC_CATEGORY_MASK_P)
+            return "P";
+          if (bitmask == UC_CATEGORY_MASK_S)
+            return "S";
+          if (bitmask == UC_CATEGORY_MASK_Z)
+            return "Z";
+          if (bitmask == UC_CATEGORY_MASK_C)
+            return "C";
+        }
     }
   return NULL;
 }
diff --git a/lib/unictype/categ_none.c b/lib/unictype/categ_none.c
index 9e33ab93..39bc8b24 100644
--- a/lib/unictype/categ_none.c
+++ b/lib/unictype/categ_none.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/lib/unictype/categ_of.c b/lib/unictype/categ_of.c
index 85b694f4..66cca8d0 100644
--- a/lib/unictype/categ_of.c
+++ b/lib/unictype/categ_of.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
@@ -31,22 +31,22 @@ lookup_withtable (ucs4_t uc)
     {
       int lookup1 = u_category.level1[index1];
       if (lookup1 >= 0)
-	{
-	  unsigned int index2 = (uc >> category_header_2) & category_header_3;
-	  int lookup2 = u_category.level2[lookup1 + index2];
-	  if (lookup2 >= 0)
-	    {
-	      unsigned int index3 = ((uc & category_header_4) + lookup2) * 5;
-	      /* level3 contains 5-bit values, packed into 16-bit words.  */
-	      unsigned int lookup3 =
-		((u_category.level3[index3>>4]
-		  | (u_category.level3[(index3>>4)+1] << 16))
-		 >> (index3 % 16))
-		& 0x1f;
+        {
+          unsigned int index2 = (uc >> category_header_2) & category_header_3;
+          int lookup2 = u_category.level2[lookup1 + index2];
+          if (lookup2 >= 0)
+            {
+              unsigned int index3 = ((uc & category_header_4) + lookup2) * 5;
+              /* level3 contains 5-bit values, packed into 16-bit words.  */
+              unsigned int lookup3 =
+                ((u_category.level3[index3>>4]
+                  | (u_category.level3[(index3>>4)+1] << 16))
+                 >> (index3 % 16))
+                & 0x1f;
 
-	      return lookup3;
-	    }
-	}
+              return lookup3;
+            }
+        }
       return 29; /* = log2(UC_CATEGORY_MASK_Cn) */
     }
   return -1;
diff --git a/lib/unictype/categ_or.c b/lib/unictype/categ_or.c
index 9864210c..9118418d 100644
--- a/lib/unictype/categ_or.c
+++ b/lib/unictype/categ_or.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This program is free software: you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
 
 uc_general_category_t
 uc_general_category_or (uc_general_category_t category1,
-			uc_general_category_t category2)
+                        uc_general_category_t category2)
 {
   uint32_t bitmask;
   uc_general_category_t result;
diff --git a/lib/unictype/categ_test.c b/lib/unictype/categ_test.c
index e46f0f65..dd935e77 100644
--- a/lib/unictype/categ_test.c
+++ b/lib/unictype/categ_test.c
@@ -1,5 +1,5 @@
 /* Categories of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/combining.c b/lib/unictype/combining.c
index d2e33e63..dfddc906 100644
--- a/lib/unictype/combining.c
+++ b/lib/unictype/combining.c
@@ -1,5 +1,5 @@
 /* Combining classes of Unicode characters.
-   Copyright (C) 2002, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, 2009-2010 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
@@ -31,17 +31,17 @@ uc_combining_class (ucs4_t uc)
     {
       int lookup1 = u_combclass.level1[index1];
       if (lookup1 >= 0)
-	{
-	  unsigned int index2 = (uc >> combclass_header_2) & combclass_header_3;
-	  int lookup2 = u_combclass.level2[lookup1 + index2];
-	  if (lookup2 >= 0)
-	    {
-	      unsigned int index3 = (uc & combclass_header_4);
-	      unsigned int lookup3 = u_combclass.level3[lookup2 + index3];
-
-	      return lookup3;
-	    }
-	}
+        {
+          unsigned int index2 = (uc >> combclass_header_2) & combclass_header_3;
+          int lookup2 = u_combclass.level2[lookup1 + index2];
+          if (lookup2 >= 0)
+            {
+              unsigned int index3 = (uc & combclass_header_4);
+              unsigned int lookup3 = u_combclass.level3[lookup2 + index3];
+
+              return lookup3;
+            }
+        }
     }
   return 0;
 }
diff --git a/lib/unictype/ctype_alnum.c b/lib/unictype/ctype_alnum.c
index 464fbb0d..aaf74848 100644
--- a/lib/unictype/ctype_alnum.c
+++ b/lib/unictype/ctype_alnum.c
@@ -1,5 +1,5 @@
 /* ISO C <ctype.h> like properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/ctype_alpha.c b/lib/unictype/ctype_alpha.c
index 4ca6e996..8c64b6d6 100644
--- a/lib/unictype/ctype_alpha.c
+++ b/lib/unictype/ctype_alpha.c
@@ -1,5 +1,5 @@
 /* ISO C <ctype.h> like properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/ctype_blank.c b/lib/unictype/ctype_blank.c
index 7e5e44f7..5e2ea542 100644
--- a/lib/unictype/ctype_blank.c
+++ b/lib/unictype/ctype_blank.c
@@ -1,5 +1,5 @@
 /* ISO C <ctype.h> like properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/ctype_cntrl.c b/lib/unictype/ctype_cntrl.c
index 8d9b148c..13869c51 100644
--- a/lib/unictype/ctype_cntrl.c
+++ b/lib/unictype/ctype_cntrl.c
@@ -1,5 +1,5 @@
 /* ISO C <ctype.h> like properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/ctype_digit.c b/lib/unictype/ctype_digit.c
index b18d9204..ec444d49 100644
--- a/lib/unictype/ctype_digit.c
+++ b/lib/unictype/ctype_digit.c
@@ -1,5 +1,5 @@
 /* ISO C <ctype.h> like properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/ctype_graph.c b/lib/unictype/ctype_graph.c
index 3c0ae118..474211be 100644
--- a/lib/unictype/ctype_graph.c
+++ b/lib/unictype/ctype_graph.c
@@ -1,5 +1,5 @@
 /* ISO C <ctype.h> like properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/ctype_lower.c b/lib/unictype/ctype_lower.c
index 1bc84344..8e1e118d 100644
--- a/lib/unictype/ctype_lower.c
+++ b/lib/unictype/ctype_lower.c
@@ -1,5 +1,5 @@
 /* ISO C <ctype.h> like properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/ctype_print.c b/lib/unictype/ctype_print.c
index 14238015..8e53e0f0 100644
--- a/lib/unictype/ctype_print.c
+++ b/lib/unictype/ctype_print.c
@@ -1,5 +1,5 @@
 /* ISO C <ctype.h> like properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/ctype_punct.c b/lib/unictype/ctype_punct.c
index e6b79469..8071a265 100644
--- a/lib/unictype/ctype_punct.c
+++ b/lib/unictype/ctype_punct.c
@@ -1,5 +1,5 @@
 /* ISO C <ctype.h> like properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/ctype_space.c b/lib/unictype/ctype_space.c
index 09d2c112..93ad8730 100644
--- a/lib/unictype/ctype_space.c
+++ b/lib/unictype/ctype_space.c
@@ -1,5 +1,5 @@
 /* ISO C <ctype.h> like properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/ctype_upper.c b/lib/unictype/ctype_upper.c
index 7724a048..9348fcc3 100644
--- a/lib/unictype/ctype_upper.c
+++ b/lib/unictype/ctype_upper.c
@@ -1,5 +1,5 @@
 /* ISO C <ctype.h> like properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/ctype_xdigit.c b/lib/unictype/ctype_xdigit.c
index 60c44c4f..e5400088 100644
--- a/lib/unictype/ctype_xdigit.c
+++ b/lib/unictype/ctype_xdigit.c
@@ -1,5 +1,5 @@
 /* ISO C <ctype.h> like properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/decdigit.c b/lib/unictype/decdigit.c
index 48b05925..79f8339c 100644
--- a/lib/unictype/decdigit.c
+++ b/lib/unictype/decdigit.c
@@ -1,5 +1,5 @@
 /* Values of decimal digit Unicode characters.
-   Copyright (C) 2002, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, 2009-2010 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
@@ -31,19 +31,19 @@ uc_decimal_value (ucs4_t uc)
     {
       int lookup1 = u_decdigit.level1[index1];
       if (lookup1 >= 0)
-	{
-	  unsigned int index2 = (uc >> decdigit_header_2) & decdigit_header_3;
-	  int lookup2 = u_decdigit.level2[lookup1 + index2];
-	  if (lookup2 >= 0)
-	    {
-	      unsigned int index3 = (uc & decdigit_header_4) + lookup2;
-	      /* level3 contains 4-bit values.  */
-	      unsigned int lookup3 =
-		(u_decdigit.level3[index3>>1] >> ((index3 % 2) * 4)) & 0x0f;
-
-	      return (int) lookup3 - 1;
-	    }
-	}
+        {
+          unsigned int index2 = (uc >> decdigit_header_2) & decdigit_header_3;
+          int lookup2 = u_decdigit.level2[lookup1 + index2];
+          if (lookup2 >= 0)
+            {
+              unsigned int index3 = (uc & decdigit_header_4) + lookup2;
+              /* level3 contains 4-bit values.  */
+              unsigned int lookup3 =
+                (u_decdigit.level3[index3>>1] >> ((index3 % 2) * 4)) & 0x0f;
+
+              return (int) lookup3 - 1;
+            }
+        }
     }
   return -1;
 }
diff --git a/lib/unictype/digit.c b/lib/unictype/digit.c
index 21545c7b..ba999a29 100644
--- a/lib/unictype/digit.c
+++ b/lib/unictype/digit.c
@@ -1,5 +1,5 @@
 /* Values of digit Unicode characters.
-   Copyright (C) 2002, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, 2009-2010 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
@@ -31,19 +31,19 @@ uc_digit_value (ucs4_t uc)
     {
       int lookup1 = u_digit.level1[index1];
       if (lookup1 >= 0)
-	{
-	  unsigned int index2 = (uc >> digit_header_2) & digit_header_3;
-	  int lookup2 = u_digit.level2[lookup1 + index2];
-	  if (lookup2 >= 0)
-	    {
-	      unsigned int index3 = (uc & digit_header_4) + lookup2;
-	      /* level3 contains 4-bit values.  */
-	      unsigned int lookup3 =
-		(u_digit.level3[index3>>1] >> ((index3 % 2) * 4)) & 0x0f;
-
-	      return (int) lookup3 - 1;
-	    }
-	}
+        {
+          unsigned int index2 = (uc >> digit_header_2) & digit_header_3;
+          int lookup2 = u_digit.level2[lookup1 + index2];
+          if (lookup2 >= 0)
+            {
+              unsigned int index3 = (uc & digit_header_4) + lookup2;
+              /* level3 contains 4-bit values.  */
+              unsigned int lookup3 =
+                (u_digit.level3[index3>>1] >> ((index3 % 2) * 4)) & 0x0f;
+
+              return (int) lookup3 - 1;
+            }
+        }
     }
   return -1;
 }
diff --git a/lib/unictype/identsyntaxmap.h b/lib/unictype/identsyntaxmap.h
index 5d9db395..5ff13fca 100644
--- a/lib/unictype/identsyntaxmap.h
+++ b/lib/unictype/identsyntaxmap.h
@@ -1,5 +1,5 @@
 /* Three-level bitmap lookup.
-   Copyright (C) 2000-2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 2000-2002, 2005-2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2000-2002.
 
    This program is free software: you can redistribute it and/or modify it
@@ -25,18 +25,18 @@ identsyntax_lookup (ucs4_t uc)
     {
       int lookup1 = TABLE.level1[index1];
       if (lookup1 >= 0)
-	{
-	  unsigned int index2 = (uc >> identsyntax_header_2) & identsyntax_header_3;
-	  int lookup2 = TABLE.level2[lookup1 + index2];
-	  if (lookup2 >= 0)
-	    {
-	      unsigned int index3 = (uc & identsyntax_header_4) + lookup2;
-	      /* level3 contains 2-bit values.  */
-	      unsigned int lookup3 = TABLE.level3[index3 >> 3];
+        {
+          unsigned int index2 = (uc >> identsyntax_header_2) & identsyntax_header_3;
+          int lookup2 = TABLE.level2[lookup1 + index2];
+          if (lookup2 >= 0)
+            {
+              unsigned int index3 = (uc & identsyntax_header_4) + lookup2;
+              /* level3 contains 2-bit values.  */
+              unsigned int lookup3 = TABLE.level3[index3 >> 3];
 
-	      return (lookup3 >> (2 * (index3 & 7))) & 3;
-	    }
-	}
+              return (lookup3 >> (2 * (index3 & 7))) & 3;
+            }
+        }
     }
   return UC_IDENTIFIER_INVALID;
 }
diff --git a/lib/unictype/mirror.c b/lib/unictype/mirror.c
index 75775447..066d9d34 100644
--- a/lib/unictype/mirror.c
+++ b/lib/unictype/mirror.c
@@ -1,5 +1,5 @@
 /* Mirrored Unicode characters.
-   Copyright (C) 2002, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, 2009-2010 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
@@ -31,18 +31,18 @@ uc_mirror_char (ucs4_t uc, ucs4_t *puc)
     {
       int lookup1 = u_mirror.level1[index1];
       if (lookup1 >= 0)
-	{
-	  unsigned int index2 = (uc >> mirror_header_2) & mirror_header_3;
-	  int lookup2 = u_mirror.level2[lookup1 + index2];
-	  if (lookup2 >= 0)
-	    {
-	      unsigned int index3 = (uc & mirror_header_4);
-	      int lookup3 = u_mirror.level3[lookup2 + index3];
-
-	      *puc = uc + lookup3;
-	      return (lookup3 != 0);
-	    }
-	}
+        {
+          unsigned int index2 = (uc >> mirror_header_2) & mirror_header_3;
+          int lookup2 = u_mirror.level2[lookup1 + index2];
+          if (lookup2 >= 0)
+            {
+              unsigned int index3 = (uc & mirror_header_4);
+              int lookup3 = u_mirror.level3[lookup2 + index3];
+
+              *puc = uc + lookup3;
+              return (lookup3 != 0);
+            }
+        }
     }
   *puc = uc;
   return false;
diff --git a/lib/unictype/numeric.c b/lib/unictype/numeric.c
index fb1512eb..9eb4630c 100644
--- a/lib/unictype/numeric.c
+++ b/lib/unictype/numeric.c
@@ -1,5 +1,5 @@
 /* Values of numeric Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
@@ -31,22 +31,22 @@ uc_numeric_value (ucs4_t uc)
     {
       int lookup1 = u_numeric.level1[index1];
       if (lookup1 >= 0)
-	{
-	  unsigned int index2 = (uc >> numeric_header_2) & numeric_header_3;
-	  int lookup2 = u_numeric.level2[lookup1 + index2];
-	  if (lookup2 >= 0)
-	    {
-	      unsigned int index3 = ((uc & numeric_header_4) + lookup2) * 7;
-	      /* level3 contains 7-bit values, packed into 16-bit words.  */
-	      unsigned int lookup3 =
-		((u_numeric.level3[index3>>4]
-		  | (u_numeric.level3[(index3>>4)+1] << 16))
-		 >> (index3 % 16))
-		& 0x7f;
-
-	      return u_numeric_values[lookup3];
-	    }
-	}
+        {
+          unsigned int index2 = (uc >> numeric_header_2) & numeric_header_3;
+          int lookup2 = u_numeric.level2[lookup1 + index2];
+          if (lookup2 >= 0)
+            {
+              unsigned int index3 = ((uc & numeric_header_4) + lookup2) * 7;
+              /* level3 contains 7-bit values, packed into 16-bit words.  */
+              unsigned int lookup3 =
+                ((u_numeric.level3[index3>>4]
+                  | (u_numeric.level3[(index3>>4)+1] << 16))
+                 >> (index3 % 16))
+                & 0x7f;
+
+              return u_numeric_values[lookup3];
+            }
+        }
     }
   {
     const uc_fraction_t default_value = { 0, 0 };
diff --git a/lib/unictype/pr_alphabetic.c b/lib/unictype/pr_alphabetic.c
index 99920916..f94c71a9 100644
--- a/lib/unictype/pr_alphabetic.c
+++ b/lib/unictype/pr_alphabetic.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_ascii_hex_digit.c b/lib/unictype/pr_ascii_hex_digit.c
index 90d3d3ad..4bad897b 100644
--- a/lib/unictype/pr_ascii_hex_digit.c
+++ b/lib/unictype/pr_ascii_hex_digit.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_bidi_arabic_digit.c b/lib/unictype/pr_bidi_arabic_digit.c
index 15f5f6be..8bcea66b 100644
--- a/lib/unictype/pr_bidi_arabic_digit.c
+++ b/lib/unictype/pr_bidi_arabic_digit.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_bidi_arabic_right_to_left.c b/lib/unictype/pr_bidi_arabic_right_to_left.c
index 81667675..834d67ac 100644
--- a/lib/unictype/pr_bidi_arabic_right_to_left.c
+++ b/lib/unictype/pr_bidi_arabic_right_to_left.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_bidi_block_separator.c b/lib/unictype/pr_bidi_block_separator.c
index 1775d365..bec778db 100644
--- a/lib/unictype/pr_bidi_block_separator.c
+++ b/lib/unictype/pr_bidi_block_separator.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_bidi_boundary_neutral.c b/lib/unictype/pr_bidi_boundary_neutral.c
index 923e89f7..f64ae859 100644
--- a/lib/unictype/pr_bidi_boundary_neutral.c
+++ b/lib/unictype/pr_bidi_boundary_neutral.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_bidi_common_separator.c b/lib/unictype/pr_bidi_common_separator.c
index 2cc1f140..2989ca6a 100644
--- a/lib/unictype/pr_bidi_common_separator.c
+++ b/lib/unictype/pr_bidi_common_separator.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_bidi_control.c b/lib/unictype/pr_bidi_control.c
index 9a4f209c..6bb0adf1 100644
--- a/lib/unictype/pr_bidi_control.c
+++ b/lib/unictype/pr_bidi_control.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_bidi_embedding_or_override.c b/lib/unictype/pr_bidi_embedding_or_override.c
index 70265223..3af5785c 100644
--- a/lib/unictype/pr_bidi_embedding_or_override.c
+++ b/lib/unictype/pr_bidi_embedding_or_override.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
@@ -40,7 +40,7 @@ uc_is_property_bidi_embedding_or_override (ucs4_t uc)
 {
   int category = uc_bidi_category (uc);
   return (category == UC_BIDI_LRE || category == UC_BIDI_LRO
-	  || category == UC_BIDI_RLE || category == UC_BIDI_RLO);
+          || category == UC_BIDI_RLE || category == UC_BIDI_RLO);
 }
 
 #endif
diff --git a/lib/unictype/pr_bidi_eur_num_separator.c b/lib/unictype/pr_bidi_eur_num_separator.c
index 53d3ea74..97a74b3b 100644
--- a/lib/unictype/pr_bidi_eur_num_separator.c
+++ b/lib/unictype/pr_bidi_eur_num_separator.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_bidi_eur_num_terminator.c b/lib/unictype/pr_bidi_eur_num_terminator.c
index de1f4ab9..7376c426 100644
--- a/lib/unictype/pr_bidi_eur_num_terminator.c
+++ b/lib/unictype/pr_bidi_eur_num_terminator.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_bidi_european_digit.c b/lib/unictype/pr_bidi_european_digit.c
index e27c5d3a..f727dcae 100644
--- a/lib/unictype/pr_bidi_european_digit.c
+++ b/lib/unictype/pr_bidi_european_digit.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_bidi_hebrew_right_to_left.c b/lib/unictype/pr_bidi_hebrew_right_to_left.c
index 9dced034..42e836f6 100644
--- a/lib/unictype/pr_bidi_hebrew_right_to_left.c
+++ b/lib/unictype/pr_bidi_hebrew_right_to_left.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_bidi_left_to_right.c b/lib/unictype/pr_bidi_left_to_right.c
index fee8443c..3da97ebe 100644
--- a/lib/unictype/pr_bidi_left_to_right.c
+++ b/lib/unictype/pr_bidi_left_to_right.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_bidi_non_spacing_mark.c b/lib/unictype/pr_bidi_non_spacing_mark.c
index 660d4c13..df470bb3 100644
--- a/lib/unictype/pr_bidi_non_spacing_mark.c
+++ b/lib/unictype/pr_bidi_non_spacing_mark.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_bidi_other_neutral.c b/lib/unictype/pr_bidi_other_neutral.c
index f87b5fbd..0f63bca6 100644
--- a/lib/unictype/pr_bidi_other_neutral.c
+++ b/lib/unictype/pr_bidi_other_neutral.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_bidi_pdf.c b/lib/unictype/pr_bidi_pdf.c
index 808a1efa..7e8ace2c 100644
--- a/lib/unictype/pr_bidi_pdf.c
+++ b/lib/unictype/pr_bidi_pdf.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_bidi_segment_separator.c b/lib/unictype/pr_bidi_segment_separator.c
index 0b3b08af..6452b079 100644
--- a/lib/unictype/pr_bidi_segment_separator.c
+++ b/lib/unictype/pr_bidi_segment_separator.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_bidi_whitespace.c b/lib/unictype/pr_bidi_whitespace.c
index d16928a1..ef22a3e3 100644
--- a/lib/unictype/pr_bidi_whitespace.c
+++ b/lib/unictype/pr_bidi_whitespace.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_byname.c b/lib/unictype/pr_byname.c
index cb6e553d..89d59b90 100644
--- a/lib/unictype/pr_byname.c
+++ b/lib/unictype/pr_byname.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This program is free software: you can redistribute it and/or modify it
@@ -40,16 +40,16 @@ uc_property_byname (const char *property_name)
     {
       unsigned char c = (unsigned char) *cp;
       if (c >= 0x80)
-	goto invalid;
+        goto invalid;
       if (c >= 'A' && c <= 'Z')
-	c += 'a' - 'A';
+        c += 'a' - 'A';
       else if (c == ' ' || c == '-')
-	c = '_';
+        c = '_';
       *bp = c;
       if (c == '\0')
-	break;
+        break;
       if (--count == 0)
-	goto invalid;
+        goto invalid;
     }
   found = uc_property_lookup (buf, bp - buf);
   if (found != NULL)
diff --git a/lib/unictype/pr_combining.c b/lib/unictype/pr_combining.c
index 5332b361..631a1b2f 100644
--- a/lib/unictype/pr_combining.c
+++ b/lib/unictype/pr_combining.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_composite.c b/lib/unictype/pr_composite.c
index 4f01ea86..0aae82a4 100644
--- a/lib/unictype/pr_composite.c
+++ b/lib/unictype/pr_composite.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_currency_symbol.c b/lib/unictype/pr_currency_symbol.c
index 8a8723b3..1f37bb5b 100644
--- a/lib/unictype/pr_currency_symbol.c
+++ b/lib/unictype/pr_currency_symbol.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_dash.c b/lib/unictype/pr_dash.c
index 16bccad1..033dc6c6 100644
--- a/lib/unictype/pr_dash.c
+++ b/lib/unictype/pr_dash.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_decimal_digit.c b/lib/unictype/pr_decimal_digit.c
index e344158a..de31d249 100644
--- a/lib/unictype/pr_decimal_digit.c
+++ b/lib/unictype/pr_decimal_digit.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_default_ignorable_code_point.c b/lib/unictype/pr_default_ignorable_code_point.c
index f4b7f19e..ce0e8166 100644
--- a/lib/unictype/pr_default_ignorable_code_point.c
+++ b/lib/unictype/pr_default_ignorable_code_point.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_deprecated.c b/lib/unictype/pr_deprecated.c
index 2b3903b4..9f8cf618 100644
--- a/lib/unictype/pr_deprecated.c
+++ b/lib/unictype/pr_deprecated.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_diacritic.c b/lib/unictype/pr_diacritic.c
index f541cd12..cb23950b 100644
--- a/lib/unictype/pr_diacritic.c
+++ b/lib/unictype/pr_diacritic.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_extender.c b/lib/unictype/pr_extender.c
index 25f11f67..5e5a69c8 100644
--- a/lib/unictype/pr_extender.c
+++ b/lib/unictype/pr_extender.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_format_control.c b/lib/unictype/pr_format_control.c
index f63bb299..aca189e4 100644
--- a/lib/unictype/pr_format_control.c
+++ b/lib/unictype/pr_format_control.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_grapheme_base.c b/lib/unictype/pr_grapheme_base.c
index 6b090bc2..1d6530c8 100644
--- a/lib/unictype/pr_grapheme_base.c
+++ b/lib/unictype/pr_grapheme_base.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_grapheme_extend.c b/lib/unictype/pr_grapheme_extend.c
index c51e82eb..1a952971 100644
--- a/lib/unictype/pr_grapheme_extend.c
+++ b/lib/unictype/pr_grapheme_extend.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_grapheme_link.c b/lib/unictype/pr_grapheme_link.c
index e7aa1335..b3a499c5 100644
--- a/lib/unictype/pr_grapheme_link.c
+++ b/lib/unictype/pr_grapheme_link.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_hex_digit.c b/lib/unictype/pr_hex_digit.c
index 09357b98..ce5a73a9 100644
--- a/lib/unictype/pr_hex_digit.c
+++ b/lib/unictype/pr_hex_digit.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_hyphen.c b/lib/unictype/pr_hyphen.c
index 22a55b69..c2a5d0f6 100644
--- a/lib/unictype/pr_hyphen.c
+++ b/lib/unictype/pr_hyphen.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_id_continue.c b/lib/unictype/pr_id_continue.c
index 5903dc65..0115c467 100644
--- a/lib/unictype/pr_id_continue.c
+++ b/lib/unictype/pr_id_continue.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_id_start.c b/lib/unictype/pr_id_start.c
index 7d5f35fc..ec349dd9 100644
--- a/lib/unictype/pr_id_start.c
+++ b/lib/unictype/pr_id_start.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_ideographic.c b/lib/unictype/pr_ideographic.c
index 18f7d02a..266034cd 100644
--- a/lib/unictype/pr_ideographic.c
+++ b/lib/unictype/pr_ideographic.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_ids_binary_operator.c b/lib/unictype/pr_ids_binary_operator.c
index 74e50c1b..25e12a31 100644
--- a/lib/unictype/pr_ids_binary_operator.c
+++ b/lib/unictype/pr_ids_binary_operator.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_ids_trinary_operator.c b/lib/unictype/pr_ids_trinary_operator.c
index 422c219e..2a852211 100644
--- a/lib/unictype/pr_ids_trinary_operator.c
+++ b/lib/unictype/pr_ids_trinary_operator.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_ignorable_control.c b/lib/unictype/pr_ignorable_control.c
index 00a7223c..7b042444 100644
--- a/lib/unictype/pr_ignorable_control.c
+++ b/lib/unictype/pr_ignorable_control.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_iso_control.c b/lib/unictype/pr_iso_control.c
index 9d2f392e..bba66088 100644
--- a/lib/unictype/pr_iso_control.c
+++ b/lib/unictype/pr_iso_control.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_join_control.c b/lib/unictype/pr_join_control.c
index ad22cea9..8cf37065 100644
--- a/lib/unictype/pr_join_control.c
+++ b/lib/unictype/pr_join_control.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_left_of_pair.c b/lib/unictype/pr_left_of_pair.c
index 62b45f48..344e3f04 100644
--- a/lib/unictype/pr_left_of_pair.c
+++ b/lib/unictype/pr_left_of_pair.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_line_separator.c b/lib/unictype/pr_line_separator.c
index 0c0b320a..72c19646 100644
--- a/lib/unictype/pr_line_separator.c
+++ b/lib/unictype/pr_line_separator.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_logical_order_exception.c b/lib/unictype/pr_logical_order_exception.c
index e06f2719..720e951b 100644
--- a/lib/unictype/pr_logical_order_exception.c
+++ b/lib/unictype/pr_logical_order_exception.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_lowercase.c b/lib/unictype/pr_lowercase.c
index ed719da9..1dbbba28 100644
--- a/lib/unictype/pr_lowercase.c
+++ b/lib/unictype/pr_lowercase.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_math.c b/lib/unictype/pr_math.c
index a4971d25..35bde045 100644
--- a/lib/unictype/pr_math.c
+++ b/lib/unictype/pr_math.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_non_break.c b/lib/unictype/pr_non_break.c
index d1855d4f..7ef84ff1 100644
--- a/lib/unictype/pr_non_break.c
+++ b/lib/unictype/pr_non_break.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_not_a_character.c b/lib/unictype/pr_not_a_character.c
index 05910fe6..b8b96c3b 100644
--- a/lib/unictype/pr_not_a_character.c
+++ b/lib/unictype/pr_not_a_character.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_numeric.c b/lib/unictype/pr_numeric.c
index dfa2250a..7fe7633c 100644
--- a/lib/unictype/pr_numeric.c
+++ b/lib/unictype/pr_numeric.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_other_alphabetic.c b/lib/unictype/pr_other_alphabetic.c
index 1a880f5b..398288f6 100644
--- a/lib/unictype/pr_other_alphabetic.c
+++ b/lib/unictype/pr_other_alphabetic.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_other_default_ignorable_code_point.c b/lib/unictype/pr_other_default_ignorable_code_point.c
index 434977d1..1f651957 100644
--- a/lib/unictype/pr_other_default_ignorable_code_point.c
+++ b/lib/unictype/pr_other_default_ignorable_code_point.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_other_grapheme_extend.c b/lib/unictype/pr_other_grapheme_extend.c
index fb7af9c2..209e19fc 100644
--- a/lib/unictype/pr_other_grapheme_extend.c
+++ b/lib/unictype/pr_other_grapheme_extend.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_other_id_continue.c b/lib/unictype/pr_other_id_continue.c
index 75e71c3c..aeb00cc8 100644
--- a/lib/unictype/pr_other_id_continue.c
+++ b/lib/unictype/pr_other_id_continue.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_other_id_start.c b/lib/unictype/pr_other_id_start.c
index 1858e47f..40d09bce 100644
--- a/lib/unictype/pr_other_id_start.c
+++ b/lib/unictype/pr_other_id_start.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_other_lowercase.c b/lib/unictype/pr_other_lowercase.c
index c199b174..8126f3c9 100644
--- a/lib/unictype/pr_other_lowercase.c
+++ b/lib/unictype/pr_other_lowercase.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_other_math.c b/lib/unictype/pr_other_math.c
index 7e130e7f..30a864db 100644
--- a/lib/unictype/pr_other_math.c
+++ b/lib/unictype/pr_other_math.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_other_uppercase.c b/lib/unictype/pr_other_uppercase.c
index 278ce514..9c6b1deb 100644
--- a/lib/unictype/pr_other_uppercase.c
+++ b/lib/unictype/pr_other_uppercase.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_paired_punctuation.c b/lib/unictype/pr_paired_punctuation.c
index 52b0dbb4..1faa2cdf 100644
--- a/lib/unictype/pr_paired_punctuation.c
+++ b/lib/unictype/pr_paired_punctuation.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_paragraph_separator.c b/lib/unictype/pr_paragraph_separator.c
index c1aeff31..dc7260dd 100644
--- a/lib/unictype/pr_paragraph_separator.c
+++ b/lib/unictype/pr_paragraph_separator.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_pattern_syntax.c b/lib/unictype/pr_pattern_syntax.c
index 5f5366f6..bd46e3f1 100644
--- a/lib/unictype/pr_pattern_syntax.c
+++ b/lib/unictype/pr_pattern_syntax.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_pattern_white_space.c b/lib/unictype/pr_pattern_white_space.c
index 407cc7e5..6c4465c8 100644
--- a/lib/unictype/pr_pattern_white_space.c
+++ b/lib/unictype/pr_pattern_white_space.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_private_use.c b/lib/unictype/pr_private_use.c
index 64a28c78..815ac9b6 100644
--- a/lib/unictype/pr_private_use.c
+++ b/lib/unictype/pr_private_use.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
@@ -39,8 +39,8 @@ bool
 uc_is_property_private_use (ucs4_t uc)
 {
   return (uc >= 0xE000 && uc <= 0xF8FF)
-	 || (uc >= 0xF0000 && uc <= 0xFFFFD)
-	 || (uc >= 0x100000 && uc <= 0x10FFFD);
+         || (uc >= 0xF0000 && uc <= 0xFFFFD)
+         || (uc >= 0x100000 && uc <= 0x10FFFD);
 }
 
 #endif
diff --git a/lib/unictype/pr_punctuation.c b/lib/unictype/pr_punctuation.c
index 00efeee3..39f0cfaf 100644
--- a/lib/unictype/pr_punctuation.c
+++ b/lib/unictype/pr_punctuation.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_quotation_mark.c b/lib/unictype/pr_quotation_mark.c
index e07fef2e..13e3239a 100644
--- a/lib/unictype/pr_quotation_mark.c
+++ b/lib/unictype/pr_quotation_mark.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_radical.c b/lib/unictype/pr_radical.c
index 13431628..3d82389c 100644
--- a/lib/unictype/pr_radical.c
+++ b/lib/unictype/pr_radical.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_sentence_terminal.c b/lib/unictype/pr_sentence_terminal.c
index 85d5e68e..81a94da9 100644
--- a/lib/unictype/pr_sentence_terminal.c
+++ b/lib/unictype/pr_sentence_terminal.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_soft_dotted.c b/lib/unictype/pr_soft_dotted.c
index b261d3c1..b4a5c8ba 100644
--- a/lib/unictype/pr_soft_dotted.c
+++ b/lib/unictype/pr_soft_dotted.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_space.c b/lib/unictype/pr_space.c
index 5bc3881e..b34b366f 100644
--- a/lib/unictype/pr_space.c
+++ b/lib/unictype/pr_space.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_terminal_punctuation.c b/lib/unictype/pr_terminal_punctuation.c
index 30a79f92..5843a347 100644
--- a/lib/unictype/pr_terminal_punctuation.c
+++ b/lib/unictype/pr_terminal_punctuation.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_test.c b/lib/unictype/pr_test.c
index 6d997b4c..e1068394 100644
--- a/lib/unictype/pr_test.c
+++ b/lib/unictype/pr_test.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005-2007, 2009-2010 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
diff --git a/lib/unictype/pr_titlecase.c b/lib/unictype/pr_titlecase.c
index eeb7dcc5..93a6a886 100644
--- a/lib/unictype/pr_titlecase.c
+++ b/lib/unictype/pr_titlecase.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_unassigned_code_value.c b/lib/unictype/pr_unassigned_code_value.c
index 328b5e7c..b7baf1b2 100644
--- a/lib/unictype/pr_unassigned_code_value.c
+++ b/lib/unictype/pr_unassigned_code_value.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_unified_ideograph.c b/lib/unictype/pr_unified_ideograph.c
index 99096a82..b08494ff 100644
--- a/lib/unictype/pr_unified_ideograph.c
+++ b/lib/unictype/pr_unified_ideograph.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_uppercase.c b/lib/unictype/pr_uppercase.c
index 38c122a9..d373393a 100644
--- a/lib/unictype/pr_uppercase.c
+++ b/lib/unictype/pr_uppercase.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_variation_selector.c b/lib/unictype/pr_variation_selector.c
index 2f1d3888..d7604d6d 100644
--- a/lib/unictype/pr_variation_selector.c
+++ b/lib/unictype/pr_variation_selector.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_white_space.c b/lib/unictype/pr_white_space.c
index 1cd9c5f4..18dc4ec2 100644
--- a/lib/unictype/pr_white_space.c
+++ b/lib/unictype/pr_white_space.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_xid_continue.c b/lib/unictype/pr_xid_continue.c
index d7d92c3c..67faae13 100644
--- a/lib/unictype/pr_xid_continue.c
+++ b/lib/unictype/pr_xid_continue.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_xid_start.c b/lib/unictype/pr_xid_start.c
index 13aab1b5..b9b496f7 100644
--- a/lib/unictype/pr_xid_start.c
+++ b/lib/unictype/pr_xid_start.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/pr_zero_width.c b/lib/unictype/pr_zero_width.c
index 7decbdae..903e0039 100644
--- a/lib/unictype/pr_zero_width.c
+++ b/lib/unictype/pr_zero_width.c
@@ -1,5 +1,5 @@
 /* Properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2010 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
diff --git a/lib/unictype/scripts.c b/lib/unictype/scripts.c
index 092009db..822c3c56 100644
--- a/lib/unictype/scripts.c
+++ b/lib/unictype/scripts.c
@@ -1,5 +1,5 @@
 /* Scripts of Unicode characters.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This program is free software: you can redistribute it and/or modify it
@@ -33,18 +33,18 @@ uc_script (ucs4_t uc)
     {
       int lookup1 = u_script.level1[index1];
       if (lookup1 >= 0)
-	{
-	  unsigned int index2 = (uc >> script_header_2) & script_header_3;
-	  int lookup2 = u_script.level2[lookup1 + index2];
-	  if (lookup2 >= 0)
-	    {
-	      unsigned int index3 = (uc & script_header_4);
-	      unsigned char lookup3 = u_script.level3[lookup2 + index3];
+        {
+          unsigned int index2 = (uc >> script_header_2) & script_header_3;
+          int lookup2 = u_script.level2[lookup1 + index2];
+          if (lookup2 >= 0)
+            {
+              unsigned int index3 = (uc & script_header_4);
+              unsigned char lookup3 = u_script.level3[lookup2 + index3];
 
-	      if (lookup3 != 0xff)
-		return &scripts[lookup3];
-	    }
-	}
+              if (lookup3 != 0xff)
+                return &scripts[lookup3];
+            }
+        }
     }
   return NULL;
 }
diff --git a/lib/unictype/sy_c_ident.c b/lib/unictype/sy_c_ident.c
index c6033c86..3d898416 100644
--- a/lib/unictype/sy_c_ident.c
+++ b/lib/unictype/sy_c_ident.c
@@ -1,5 +1,5 @@
 /* Syntax properties of Unicode characters.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/lib/unictype/sy_c_whitespace.c b/lib/unictype/sy_c_whitespace.c
index 6d996a6f..989838f4 100644
--- a/lib/unictype/sy_c_whitespace.c
+++ b/lib/unictype/sy_c_whitespace.c
@@ -1,5 +1,5 @@
 /* Syntax properties of Unicode characters.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/lib/unictype/sy_java_ident.c b/lib/unictype/sy_java_ident.c
index b0770d6e..1defc2b3 100644
--- a/lib/unictype/sy_java_ident.c
+++ b/lib/unictype/sy_java_ident.c
@@ -1,5 +1,5 @@
 /* Syntax properties of Unicode characters.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/lib/unictype/sy_java_whitespace.c b/lib/unictype/sy_java_whitespace.c
index 4b56f3e3..34d3afde 100644
--- a/lib/unictype/sy_java_whitespace.c
+++ b/lib/unictype/sy_java_whitespace.c
@@ -1,5 +1,5 @@
 /* Syntax properties of Unicode characters.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This program is free software: you can redistribute it and/or modify it