summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@behdad.org>2012-08-25 14:05:46 -0400
committerBehdad Esfahbod <behdad@behdad.org>2012-08-25 16:07:32 -0400
commitffe01357f645fc0182b588f0245438dff3ade1be (patch)
tree0604d9d26abad6e7eeeca304029b72876d3995c5
parentaee4341fb14a579c77c274813ca0e24b41fa5caa (diff)
downloadpango-ffe01357f645fc0182b588f0245438dff3ade1be.tar.gz
Update to Unicode 6.1
-rw-r--r--NEWS1
-rw-r--r--docs/tmpl/scripts.sgml10
-rw-r--r--pango/pango-language.c29
-rw-r--r--pango/pango-script.h16
4 files changed, 54 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 2158e0da..5b891ec8 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ Overview of changes between 1.31.0 and 1.31.1
- The module cache file can now be located in libdir
- 682421 - Fix vertical text, gravity, etc, with HarfBuzz
- Deprecate pango-ot.h.
+- Update to Unicode 6.1.
Overview of changes between 1.30.1 and 1.31.0
=============================================
diff --git a/docs/tmpl/scripts.sgml b/docs/tmpl/scripts.sgml
index a70d3b40..789f26b3 100644
--- a/docs/tmpl/scripts.sgml
+++ b/docs/tmpl/scripts.sgml
@@ -114,6 +114,16 @@ url="http://www.unicode.org/reports/tr24/">Unicode Standard Annex
@PANGO_SCRIPT_CARIAN: Carian. Since 1.20.1
@PANGO_SCRIPT_LYCIAN: Lycian. Since 1.20.1
@PANGO_SCRIPT_LYDIAN: Lydian. Since 1.20.1
+@PANGO_SCRIPT_BATAK: Batak. Since 1.32
+@PANGO_SCRIPT_BRAHMI: Brahmi. Since 1.32
+@PANGO_SCRIPT_MANDAIC: Mandaic. Since 1.32
+@PANGO_SCRIPT_CHAKMA: Chakma. Since: 1.32
+@PANGO_SCRIPT_MEROITIC_CURSIVE: Meroitic Cursive. Since: 1.32
+@PANGO_SCRIPT_MEROITIC_HIEROGLYPHS: Meroitic Hieroglyphs. Since: 1.32
+@PANGO_SCRIPT_MIAO: Miao. Since: 1.32
+@PANGO_SCRIPT_SHARADA: Sharada. Since: 1.32
+@PANGO_SCRIPT_SORA_SOMPENG: Sora Sompeng. Since: 1.32
+@PANGO_SCRIPT_TAKRI: Takri. Since: 1.32
<!-- ##### MACRO PANGO_TYPE_SCRIPT ##### -->
<para>
diff --git a/pango/pango-language.c b/pango/pango-language.c
index 399abc78..9af84892 100644
--- a/pango/pango-language.c
+++ b/pango/pango-language.c
@@ -904,7 +904,34 @@ pango_script_get_sample_language (PangoScript script)
"", /* PANGO_SCRIPT_CUNEIFORM */
"", /* PANGO_SCRIPT_PHOENICIAN */
"", /* PANGO_SCRIPT_PHAGS_PA */
- "nqo" /* PANGO_SCRIPT_NKO */
+ "nqo", /* PANGO_SCRIPT_NKO */
+
+ /* Unicode-5.1 additions */
+ "", /* PANGO_SCRIPT_KAYAH_LI */
+ "", /* PANGO_SCRIPT_LEPCHA */
+ "", /* PANGO_SCRIPT_REJANG */
+ "", /* PANGO_SCRIPT_SUNDANESE */
+ "", /* PANGO_SCRIPT_SAURASHTRA */
+ "", /* PANGO_SCRIPT_CHAM */
+ "", /* PANGO_SCRIPT_OL_CHIKI */
+ "", /* PANGO_SCRIPT_VAI */
+ "", /* PANGO_SCRIPT_CARIAN */
+ "", /* PANGO_SCRIPT_LYCIAN */
+ "", /* PANGO_SCRIPT_LYDIAN */
+
+ /* Unicode-6.0 additions */
+ "", /* PANGO_SCRIPT_BATAK */
+ "", /* PANGO_SCRIPT_BRAHMI */
+ "", /* PANGO_SCRIPT_MANDAIC */
+
+ /* Unicode-6.1 additions */
+ "", /* PANGO_SCRIPT_CHAKMA */
+ "", /* PANGO_SCRIPT_MEROITIC_CURSIVE */
+ "", /* PANGO_SCRIPT_MEROITIC_HIEROGLYPHS */
+ "", /* PANGO_SCRIPT_MIAO */
+ "", /* PANGO_SCRIPT_SHARADA */
+ "", /* PANGO_SCRIPT_SORA_SOMPENG */
+ "", /* PANGO_SCRIPT_TAKRI */
};
const char *sample_language;
PangoLanguage *result;
diff --git a/pango/pango-script.h b/pango/pango-script.h
index ef5f698b..cc3d0ecc 100644
--- a/pango/pango-script.h
+++ b/pango/pango-script.h
@@ -121,7 +121,21 @@ typedef enum { /* ISO 15924 code */
PANGO_SCRIPT_VAI, /* Vaii */
PANGO_SCRIPT_CARIAN, /* Cari */
PANGO_SCRIPT_LYCIAN, /* Lyci */
- PANGO_SCRIPT_LYDIAN /* Lydi */
+ PANGO_SCRIPT_LYDIAN, /* Lydi */
+
+ /* Unicode-6.0 additions */
+ PANGO_SCRIPT_BATAK, /* Batk */
+ PANGO_SCRIPT_BRAHMI, /* Brah */
+ PANGO_SCRIPT_MANDAIC, /* Mand */
+
+ /* Unicode-6.1 additions */
+ PANGO_SCRIPT_CHAKMA, /* Cakm */
+ PANGO_SCRIPT_MEROITIC_CURSIVE, /* Merc */
+ PANGO_SCRIPT_MEROITIC_HIEROGLYPHS,/* Mero */
+ PANGO_SCRIPT_MIAO, /* Plrd */
+ PANGO_SCRIPT_SHARADA, /* Shrd */
+ PANGO_SCRIPT_SORA_SOMPENG, /* Sora */
+ PANGO_SCRIPT_TAKRI /* Takr */
} PangoScript;
PangoScript pango_script_for_unichar (gunichar ch) G_GNUC_CONST;