[gucharmap] unicode: Prepare update to unicode 10.0.0

[Christian Persch <chpe src gnome org>]

commit 91ae8a8a7923fc87b672cddbd2a0b06a0ed4e484
Author: Christian Persch <chpe src gnome org>
Date:   Tue Mar 21 22:44:27 2017 +0100

    unicode: Prepare update to unicode 10.0.0
    
    Need to use --with-unicode-data=... pointing to a download of the necessary
    files from www.unicode.org/Public/10.0.0/ucd; the 'download' option won't
    work until the 10.0.0 release.

 configure.ac                         |    4 ++--
 gucharmap/Makefile.am                |    2 +-
 gucharmap/gen-guch-unicode-tables.pl |    4 ++--
 gucharmap/gucharmap-unicode-info.c   |    5 +++--
 gucharmap/gucharmap-unicode-info.h   |    3 ++-
 gucharmap/gucharmap-window.c         |    6 +++---
 gucharmap/unicode-i18n.h             |   13 ++++++++++++-
 7 files changed, 25 insertions(+), 12 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4353eb3..f123bb5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,9 +15,9 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA 02110-1301  USA
 
-m4_define([gucharmap_version_major],[9])
+m4_define([gucharmap_version_major],[10])
 m4_define([gucharmap_version_minor],[0])
-m4_define([gucharmap_version_micro],[4])
+m4_define([gucharmap_version_micro],[0])
 m4_define([gucharmap_version_extra],[])
 
m4_define([gucharmap_version],[gucharmap_version_major.gucharmap_version_minor.gucharmap_version_micro()gucharmap_version_extra])
 
diff --git a/gucharmap/Makefile.am b/gucharmap/Makefile.am
index c770d5c..9c70539 100644
--- a/gucharmap/Makefile.am
+++ b/gucharmap/Makefile.am
@@ -204,7 +204,7 @@ gucharmap-type-builtins.c: gucharmap-type-builtins.c.template $(libgucharmapincl
 
 WGETFLAGS = --timestamping --timeout=300 --tries=8 --no-directories --directory-prefix="$(builddir)"
 
-unicode_version = 9.0.0
+unicode_version = 10.0.0
 
 unicode_files = \
        Blocks.txt \
diff --git a/gucharmap/gen-guch-unicode-tables.pl b/gucharmap/gen-guch-unicode-tables.pl
index c73b191..b758354 100755
--- a/gucharmap/gen-guch-unicode-tables.pl
+++ b/gucharmap/gen-guch-unicode-tables.pl
@@ -1040,7 +1040,7 @@ sub process_versions_txt
     print $out "static const gchar unicode_version_strings[] =\n";
     my $offset = 0;
     my %version_offsets;
-    for my $version (sort keys %versions)
+    for my $version (sort { $a <=> $b } keys %versions)
     {
         printf $out (qq/  "\%s\\0"\n/, $version);
        $version_offsets{$version} = $offset;
@@ -1051,7 +1051,7 @@ sub process_versions_txt
 
     print $out "static const guint16 unicode_version_string_offsets[] =\n";
     print $out "{\n";
-    for my $version (sort keys %versions)
+    for my $version (sort { $a <=> $b } keys %versions)
     {
         printf $out (qq/  \%d,\n/, $version_offsets{$version});
     }
diff --git a/gucharmap/gucharmap-unicode-info.c b/gucharmap/gucharmap-unicode-info.c
index fae179f..a1bd398 100644
--- a/gucharmap/gucharmap-unicode-info.c
+++ b/gucharmap/gucharmap-unicode-info.c
@@ -66,11 +66,12 @@ gucharmap_get_unicode_name (gunichar wc)
   _gucharmap_intl_ensure_initialized ();
 
   if ((wc >= 0x3400 && wc <= 0x4db5)
-      || (wc >= 0x4e00 && wc <= 0x9fd5)
+      || (wc >= 0x4e00 && wc <= 0x9fea)
       || (wc >= 0x20000 && wc <= 0x2a6d6)
       || (wc >= 0x2a700 && wc <= 0x2b734)
       || (wc >= 0x2b740 && wc <= 0x2b81d)
-      || (wc >= 0x2b820 && wc <= 0x2cea1))
+      || (wc >= 0x2b820 && wc <= 0x2cea1)
+      || (wc >= 0x2ceb0 && wc <= 0x2ebe0))
     {
       g_snprintf (buf, sizeof (buf), "CJK UNIFIED IDEOGRAPH-%04X", wc);
       return buf;
diff --git a/gucharmap/gucharmap-unicode-info.h b/gucharmap/gucharmap-unicode-info.h
index 203d172..c2d089e 100644
--- a/gucharmap/gucharmap-unicode-info.h
+++ b/gucharmap/gucharmap-unicode-info.h
@@ -48,7 +48,8 @@ typedef enum {
   GUCHARMAP_UNICODE_VERSION_7_0,
   GUCHARMAP_UNICODE_VERSION_8_0,
   GUCHARMAP_UNICODE_VERSION_9_0,
-  GUCHARMAP_UNICODE_VERSION_LATEST = GUCHARMAP_UNICODE_VERSION_9_0 /* private, will move forward with each 
revision */
+  GUCHARMAP_UNICODE_VERSION_10_0,
+  GUCHARMAP_UNICODE_VERSION_LATEST = GUCHARMAP_UNICODE_VERSION_10_0 /* private, will move forward with each 
revision */
 } GucharmapUnicodeVersion;
 
 /* return values are read-only */
diff --git a/gucharmap/gucharmap-window.c b/gucharmap/gucharmap-window.c
index e0761f6..8894794 100644
--- a/gucharmap/gucharmap-window.c
+++ b/gucharmap/gucharmap-window.c
@@ -454,10 +454,10 @@ help_about (GSimpleAction *action,
   gtk_show_about_dialog (GTK_WINDOW (guw),
                         "program-name", _("GNOME Character Map"),
                         "version", VERSION,
-                        "comments", _("Based on the Unicode Character Database 9.0.0"),
+                        "comments", _("Based on the Unicode Character Database 10.0.0"),
                         "copyright", "Copyright © 2004 Noah Levitt\n"
-                                     "Copyright © 1991–2016 Unicode, Inc.\n"
-                                     "Copyright © 2007–2016 Christian Persch\n"
+                                     "Copyright © 1991–2017 Unicode, Inc.\n"
+                                     "Copyright © 2007–2017 Christian Persch\n"
                                       "Copyright © 2016 DaeHyun Sung",
                         "documenters", documenters,
                         "license", license_trans,
diff --git a/gucharmap/unicode-i18n.h b/gucharmap/unicode-i18n.h
index c3c4b09..419938e 100644
--- a/gucharmap/unicode-i18n.h
+++ b/gucharmap/unicode-i18n.h
@@ -1,7 +1,7 @@
 unicode-i18n.h for extraction by gettext
 THIS IS A GENERATED FILE. CHANGES WILL BE OVERWRITTEN.
 Generated by ./gen-guch-unicode-tables.pl
-Generated from UCD version 9.0.0
+Generated from UCD version 10.0.0
 
 N_("Basic Latin")
 N_("Latin-1 Supplement")
@@ -22,6 +22,7 @@ N_("Thaana")
 N_("N'Ko")
 N_("Samaritan")
 N_("Mandaic")
+N_("Syriac Supplement")
 N_("Arabic Extended-A")
 N_("Devanagari")
 N_("Bengali")
@@ -224,9 +225,12 @@ N_("Mongolian Supplement")
 N_("Takri")
 N_("Ahom")
 N_("Warang Citi")
+N_("Zanabazar Square")
+N_("Soyombo")
 N_("Pau Cin Hau")
 N_("Bhaiksuki")
 N_("Marchen")
+N_("Masaram Gondi")
 N_("Cuneiform")
 N_("Cuneiform Numbers and Punctuation")
 N_("Early Dynastic Cuneiform")
@@ -241,6 +245,8 @@ N_("Ideographic Symbols and Punctuation")
 N_("Tangut")
 N_("Tangut Components")
 N_("Kana Supplement")
+N_("Kana Extended-A")
+N_("Nushu")
 N_("Duployan")
 N_("Shorthand Format Controls")
 N_("Byzantine Musical Symbols")
@@ -271,6 +277,7 @@ N_("CJK Unified Ideographs Extension B")
 N_("CJK Unified Ideographs Extension C")
 N_("CJK Unified Ideographs Extension D")
 N_("CJK Unified Ideographs Extension E")
+N_("CJK Unified Ideographs Extension F")
 N_("CJK Compatibility Ideographs Supplement")
 N_("Tags")
 N_("Variation Selectors Supplement")
@@ -351,6 +358,7 @@ N_("Malayalam")
 N_("Mandaic")
 N_("Manichaean")
 N_("Marchen")
+N_("Masaram Gondi")
 N_("Meetei Mayek")
 N_("Mende Kikakui")
 N_("Meroitic Cursive")
@@ -365,6 +373,7 @@ N_("N'Ko")
 N_("Nabataean")
 N_("New Tai Lue")
 N_("Newa")
+N_("Nushu")
 N_("Ogham")
 N_("Ol Chiki")
 N_("Old Hungarian")
@@ -393,6 +402,7 @@ N_("Siddham")
 N_("Signwriting")
 N_("Sinhala")
 N_("Sora Sompeng")
+N_("Soyombo")
 N_("Sundanese")
 N_("Syloti Nagri")
 N_("Syriac")
@@ -414,3 +424,4 @@ N_("Ugaritic")
 N_("Vai")
 N_("Warang Citi")
 N_("Yi")
+N_("Zanabazar Square")