[gucharmap] Fix parsing of non-BMP 'x' references in NamesList.txt

[Christian Persch <chpe src gnome org>]

commit 1542be747c84a9f43f5531b5f8273ace065252f1
Author: Christian Persch <chpe gnome org>
Date:   Wed Aug 18 11:23:07 2010 +0200

    Fix parsing of non-BMP 'x' references in NamesList.txt
    
    Bug #627144.

 gucharmap/gen-guch-unicode-tables.pl |    2 +-
 gucharmap/unicode-nameslist.h        |   80 +++++++++++++++++-----------------
 2 files changed, 41 insertions(+), 41 deletions(-)
---
diff --git a/gucharmap/gen-guch-unicode-tables.pl b/gucharmap/gen-guch-unicode-tables.pl
index fe6935f..872a57a 100755
--- a/gucharmap/gen-guch-unicode-tables.pl
+++ b/gucharmap/gen-guch-unicode-tables.pl
@@ -599,7 +599,7 @@ sub process_nameslist_txt ($)
 
             $colon_i++;
         }
-        elsif ($line =~ /^\s+x\s+.*([0-9A-F]{4,6})\)$/)  # this one is different
+        elsif ($line =~ /^\s+x\s+.*?([0-9A-F]{4,6})\)$/)  # this one is different
         {
             my $value = hex ($1);
 
diff --git a/gucharmap/unicode-nameslist.h b/gucharmap/unicode-nameslist.h
index 65f4723..18fe461 100644
--- a/gucharmap/unicode-nameslist.h
+++ b/gucharmap/unicode-nameslist.h
@@ -16579,7 +16579,7 @@ static const UnicharUnichar names_list_exes[] =
   { 0x002D, 0x2012 },
   { 0x002D, 0x2013 },
   { 0x002D, 0x2212 },
-  { 0x002D, 0x0191 },
+  { 0x002D, 0x10191 },
   { 0x002E, 0x06D4 },
   { 0x002E, 0x3002 },
   { 0x002F, 0x01C0 },
@@ -16600,7 +16600,7 @@ static const UnicharUnichar names_list_exes[] =
   { 0x003D, 0x2260 },
   { 0x003D, 0x2261 },
   { 0x003D, 0xA78A },
-  { 0x003D, 0x0190 },
+  { 0x003D, 0x10190 },
   { 0x003E, 0x203A },
   { 0x003E, 0x232A },
   { 0x003E, 0x27E9 },
@@ -16660,11 +16660,11 @@ static const UnicharUnichar names_list_exes[] =
   { 0x0068, 0x04BB },
   { 0x0068, 0x210E },
   { 0x0069, 0x0131 },
-  { 0x0069, 0xD6A4 },
+  { 0x0069, 0x1D6A4 },
   { 0x006A, 0x0237 },
-  { 0x006A, 0xD6A5 },
+  { 0x006A, 0x1D6A5 },
   { 0x006C, 0x2113 },
-  { 0x006C, 0xD4C1 },
+  { 0x006C, 0x1D4C1 },
   { 0x006E, 0x207F },
   { 0x006F, 0x2134 },
   { 0x007A, 0x01B6 },
@@ -16686,7 +16686,7 @@ static const UnicharUnichar names_list_exes[] =
   { 0x00A0, 0xFEFF },
   { 0x00A1, 0x0021 },
   { 0x00A3, 0x20A4 },
-  { 0x00A3, 0x0192 },
+  { 0x00A3, 0x10192 },
   { 0x00A4, 0x0024 },
   { 0x00A8, 0x0308 },
   { 0x00A9, 0x2117 },
@@ -16806,7 +16806,7 @@ static const UnicharUnichar names_list_exes[] =
   { 0x021D, 0x1D79 },
   { 0x021D, 0x2125 },
   { 0x0223, 0x0038 },
-  { 0x0237, 0xD6A5 },
+  { 0x0237, 0x1D6A5 },
   { 0x0242, 0x0294 },
   { 0x0242, 0x02C0 },
   { 0x0251, 0x03B1 },
@@ -17326,7 +17326,7 @@ static const UnicharUnichar names_list_exes[] =
   { 0x203A, 0x232A },
   { 0x203A, 0x3009 },
   { 0x203B, 0x0FBF },
-  { 0x203B, 0x00AD },
+  { 0x203B, 0x200AD },
   { 0x203C, 0x0021 },
   { 0x203D, 0x0021 },
   { 0x203D, 0x003F },
@@ -17347,7 +17347,7 @@ static const UnicharUnichar names_list_exes[] =
   { 0x2055, 0x274B },
   { 0x2059, 0x2684 },
   { 0x205A, 0xFE30 },
-  { 0x205A, 0x015B },
+  { 0x205A, 0x1015B },
   { 0x205D, 0x22EE },
   { 0x205D, 0x2AF6 },
   { 0x205D, 0xFE19 },
@@ -17379,13 +17379,13 @@ static const UnicharUnichar names_list_exes[] =
   { 0x2101, 0x214D },
   { 0x2107, 0x0045 },
   { 0x210F, 0x045B },
-  { 0x2113, 0xD4C1 },
+  { 0x2113, 0x1D4C1 },
   { 0x2114, 0x0023 },
   { 0x2117, 0x00A9 },
   { 0x2117, 0x24C5 },
   { 0x2121, 0x260E },
   { 0x2121, 0x2706 },
-  { 0x2122, 0xF12E },
+  { 0x2122, 0x1F12E },
   { 0x2125, 0x021D },
   { 0x2126, 0x260A },
   { 0x2127, 0x01B1 },
@@ -17434,7 +17434,7 @@ static const UnicharUnichar names_list_exes[] =
   { 0x2218, 0x00B0 },
   { 0x2218, 0x0970 },
   { 0x2218, 0x25E6 },
-  { 0x2218, 0x0B39 },
+  { 0x2218, 0x10B39 },
   { 0x2219, 0x00B7 },
   { 0x2219, 0x2022 },
   { 0x2219, 0x2024 },
@@ -17550,7 +17550,7 @@ static const UnicharUnichar names_list_exes[] =
   { 0x233B, 0x29C7 },
   { 0x233E, 0x229A },
   { 0x233E, 0x29BE },
-  { 0x233F, 0x019A },
+  { 0x233F, 0x1019A },
   { 0x2340, 0x29F7 },
   { 0x2341, 0x29C4 },
   { 0x2342, 0x29C5 },
@@ -17582,9 +17582,9 @@ static const UnicharUnichar names_list_exes[] =
   { 0x23CC, 0x230B },
   { 0x23CE, 0x21B5 },
   { 0x23D0, 0x23AF },
-  { 0x23D7, 0xD242 },
-  { 0x23D8, 0xD243 },
-  { 0x23D9, 0xD244 },
+  { 0x23D7, 0x1D242 },
+  { 0x23D8, 0x1D243 },
+  { 0x23D9, 0x1D244 },
   { 0x23DC, 0xFE35 },
   { 0x23DD, 0xFE36 },
   { 0x23DE, 0xFE37 },
@@ -18090,7 +18090,7 @@ static const UnicharUnichar names_list_exes[] =
   { 0x30A0, 0x003D },
   { 0x30FB, 0x00B7 },
   { 0x30FC, 0x2014 },
-  { 0x33C5, 0xF12D },
+  { 0x33C5, 0x1F12D },
   { 0xA490, 0xA408 },
   { 0xA491, 0xA1B9 },
   { 0xA558, 0xA610 },
@@ -18105,7 +18105,7 @@ static const UnicharUnichar names_list_exes[] =
   { 0xA62B, 0xA5D1 },
   { 0xA641, 0x0437 },
   { 0xA643, 0x0455 },
-  { 0xA644, 0x0193 },
+  { 0xA644, 0x10193 },
   { 0xA647, 0x2C3A },
   { 0xA649, 0x0452 },
   { 0xA649, 0x045B },
@@ -18231,7 +18231,7 @@ static const UnicharUnichar names_list_exes[] =
   { 0xFFE3, 0x203E },
   { 0xFFFE, 0xFEFF },
   { 0x1015B, 0x205A },
-  { 0x1015E, 0x0111 },
+  { 0x1015E, 0x10111 },
   { 0x10190, 0x003D },
   { 0x10191, 0x002D },
   { 0x10192, 0x00A3 },
@@ -18289,43 +18289,43 @@ static const UnicharUnichar names_list_exes[] =
   { 0x10B39, 0x2218 },
   { 0x10B39, 0x2E30 },
   { 0x10B39, 0x2E31 },
-  { 0x12470, 0x039F },
-  { 0x12470, 0x03D0 },
+  { 0x12470, 0x1039F },
+  { 0x12470, 0x103D0 },
   { 0x1309D, 0x05E2 },
   { 0x1309D, 0x0639 },
   { 0x1313F, 0x05D0 },
   { 0x1313F, 0x0623 },
   { 0x131CB, 0x05D9 },
   { 0x131CB, 0x064A },
-  { 0x131CC, 0x33ED },
+  { 0x131CC, 0x133ED },
   { 0x1320E, 0x05E7 },
   { 0x1320E, 0x0642 },
   { 0x13254, 0x05D4 },
   { 0x13254, 0x0647 },
-  { 0x13258, 0x3282 },
-  { 0x13282, 0x3258 },
-  { 0x13283, 0x32F4 },
-  { 0x132F4, 0x3283 },
+  { 0x13258, 0x13282 },
+  { 0x13282, 0x13258 },
+  { 0x13283, 0x132F4 },
+  { 0x132F4, 0x13283 },
   { 0x1339B, 0x062D },
   { 0x133A1, 0x05DB },
   { 0x133A1, 0x0643 },
-  { 0x133E4, 0x33FA },
-  { 0x133E5, 0x33FC },
-  { 0x133ED, 0x31CC },
-  { 0x133EE, 0x33FB },
-  { 0x133FA, 0x33E4 },
-  { 0x133FB, 0x33EE },
-  { 0x133FC, 0x33E5 },
-  { 0x133FC, 0x33EA },
+  { 0x133E4, 0x133FA },
+  { 0x133E5, 0x133FC },
+  { 0x133ED, 0x131CC },
+  { 0x133EE, 0x133FB },
+  { 0x133FA, 0x133E4 },
+  { 0x133FB, 0x133EE },
+  { 0x133FC, 0x133E5 },
+  { 0x133FC, 0x133EA },
   { 0x1340D, 0x062E },
   { 0x1D0B4, 0x03BD },
   { 0x1D0B5, 0x03BD },
-  { 0x1D0DA, 0xD105 },
-  { 0x1D0DB, 0xD100 },
+  { 0x1D0DA, 0x1D105 },
+  { 0x1D0DB, 0x1D100 },
   { 0x1D0E7, 0x0223 },
   { 0x1D0E8, 0x03DB },
-  { 0x1D129, 0xD13A },
-  { 0x1D13A, 0xD129 },
+  { 0x1D129, 0x1D13A },
+  { 0x1D13A, 0x1D129 },
   { 0x1D20D, 0x0056 },
   { 0x1D242, 0x23D7 },
   { 0x1D243, 0x23D8 },
@@ -18358,9 +18358,9 @@ static const UnicharUnichar names_list_exes[] =
   { 0x1D549, 0x211D },
   { 0x1D551, 0x2124 },
   { 0x1D6A4, 0x0131 },
-  { 0x1D6A4, 0xD456 },
+  { 0x1D6A4, 0x1D456 },
   { 0x1D6A5, 0x0237 },
-  { 0x1D6A5, 0xD457 },
+  { 0x1D6A5, 0x1D457 },
   { 0x1F12D, 0x33C5 },
   { 0x1F12E, 0x2122 },
   { (gunichar)(-1), 0 }