Update from latest fontconfig sources.

2007-05-09  Behdad Esfahbod  <behdad@gnome.org>

        * pango/pango-script-lang-table.h:  Update from latest fontconfig
        sources.

        * tools/gen-script-for-lang.c (scripts_for_line): Make it handle
        PANGO_SCRIPT_UNKNOWN.

svn path=/trunk/; revision=2271

diff --git a/ChangeLog b/ChangeLog
index 1e2ee92..cae16ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2007-05-09  Behdad Esfahbod  <behdad@gnome.org>
 
+       * pango/pango-script-lang-table.h:  Update from latest fontconfig
+       sources.
+
+       * tools/gen-script-for-lang.c (scripts_for_line): Make it handle
+       PANGO_SCRIPT_UNKNOWN.
+
+2007-05-09  Behdad Esfahbod  <behdad@gnome.org>
+
        * pango/pango-language.c (script_for_lang_compare),
        (pango_language_includes_script):
        * pango/pango-script.c: Move pango_language_includes_script() from

diff --git a/pango/pango-script-lang-table.h b/pango/pango-script-lang-table.h
index b2400f3..1817271 100644 (file)
--- a/pango/pango-script-lang-table.h
+++ b/pango/pango-script-lang-table.h
@@ -1,7 +1,7 @@
 /* pango-script-lang-table.h: Generated by gen-script-for-lang.c
  *
- * Date:   24 July 2006
- * Source: fontconfig-2.3.9x
+ * Date:   9 May 2007
+ * Source: fontconfig-2.4.2
  *
  * Do not edit.
  */
@@ -16,6 +16,7 @@ static const PangoScriptForLang pango_script_for_lang[] = {
   { "af", { PANGO_SCRIPT_LATIN, PANGO_SCRIPT_INVALID_CODE, PANGO_SCRIPT_INVALID_CODE } },
   { "am", { PANGO_SCRIPT_ETHIOPIC, PANGO_SCRIPT_INVALID_CODE, PANGO_SCRIPT_INVALID_CODE } },
   { "ar", { PANGO_SCRIPT_ARABIC, PANGO_SCRIPT_INVALID_CODE, PANGO_SCRIPT_INVALID_CODE } },
+  { "as", { PANGO_SCRIPT_BENGALI, PANGO_SCRIPT_INVALID_CODE, PANGO_SCRIPT_INVALID_CODE } },
   { "ast", { PANGO_SCRIPT_LATIN, PANGO_SCRIPT_INVALID_CODE, PANGO_SCRIPT_INVALID_CODE } },
   { "ava", { PANGO_SCRIPT_CYRILLIC, PANGO_SCRIPT_INVALID_CODE, PANGO_SCRIPT_INVALID_CODE } },
   { "ay", { PANGO_SCRIPT_LATIN, PANGO_SCRIPT_INVALID_CODE, PANGO_SCRIPT_INVALID_CODE } },

diff --git a/tools/gen-script-for-lang.c b/tools/gen-script-for-lang.c
index 00d847a..6d866f6 100644 (file)
--- a/tools/gen-script-for-lang.c
+++ b/tools/gen-script-for-lang.c
@@ -136,6 +136,13 @@ scripts_for_line (const char  *base_dir,
          script != PANGO_SCRIPT_INHERITED)
        {
          int j;
+
+         if (script == PANGO_SCRIPT_UNKNOWN)
+           {
+              g_message ("Script unknown for U+%04X", ch);
+              continue;
+           }
+
          for (j = 0; j < MAX_SCRIPTS; j++)
            {
              if (info->scripts[j] == script)