From aaf44b08dd619e545e12ef0c106e5685b68233c3 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Mon, 27 May 2019 13:21:38 +0000 Subject: Revert "Replace PangoScript by GUnicodeScript" This reverts commit 3e754defc364a89b2136894399b3463976840156 --- pango/pango-script.h | 261 +++++++++++++++++++++++++++------------------------ 1 file changed, 136 insertions(+), 125 deletions(-) (limited to 'pango/pango-script.h') diff --git a/pango/pango-script.h b/pango/pango-script.h index 7dcd95c9..62876025 100644 --- a/pango/pango-script.h +++ b/pango/pango-script.h @@ -156,7 +156,7 @@ typedef struct _PangoScriptIter PangoScriptIter; * @PANGO_SCRIPT_OLD_HUNGARIAN: Old Hungarian. Since: 1.40 * @PANGO_SCRIPT_SIGNWRITING: Signwriting. Since: 1.40 * - * The #PangoScript enumeration identifes different writing + * The #PangoScript enumeration identifies different writing * systems. The values correspond to the names as defined in the * Unicode standard. * Note that new types may be added in the future. Applications should be ready @@ -164,132 +164,143 @@ typedef struct _PangoScriptIter PangoScriptIter; * #GUnicodeScript. See Unicode Standard Annex * #24: Script names. - * - * Applications should use the GUnicodeScript enumeration directly. - * PangoScript is deprecated. The current PANGO_SCRIPT_ values are - * preserved for compatibility, but new values will only be added - * in the G_UNICODE_SCRIPT_ namespace. */ -typedef GUnicodeScript PangoScript; +typedef enum { /* ISO 15924 code */ + PANGO_SCRIPT_INVALID_CODE = -1, + PANGO_SCRIPT_COMMON = 0, /* Zyyy */ + PANGO_SCRIPT_INHERITED, /* Qaai */ + PANGO_SCRIPT_ARABIC, /* Arab */ + PANGO_SCRIPT_ARMENIAN, /* Armn */ + PANGO_SCRIPT_BENGALI, /* Beng */ + PANGO_SCRIPT_BOPOMOFO, /* Bopo */ + PANGO_SCRIPT_CHEROKEE, /* Cher */ + PANGO_SCRIPT_COPTIC, /* Qaac */ + PANGO_SCRIPT_CYRILLIC, /* Cyrl (Cyrs) */ + PANGO_SCRIPT_DESERET, /* Dsrt */ + PANGO_SCRIPT_DEVANAGARI, /* Deva */ + PANGO_SCRIPT_ETHIOPIC, /* Ethi */ + PANGO_SCRIPT_GEORGIAN, /* Geor (Geon, Geoa) */ + PANGO_SCRIPT_GOTHIC, /* Goth */ + PANGO_SCRIPT_GREEK, /* Grek */ + PANGO_SCRIPT_GUJARATI, /* Gujr */ + PANGO_SCRIPT_GURMUKHI, /* Guru */ + PANGO_SCRIPT_HAN, /* Hani */ + PANGO_SCRIPT_HANGUL, /* Hang */ + PANGO_SCRIPT_HEBREW, /* Hebr */ + PANGO_SCRIPT_HIRAGANA, /* Hira */ + PANGO_SCRIPT_KANNADA, /* Knda */ + PANGO_SCRIPT_KATAKANA, /* Kana */ + PANGO_SCRIPT_KHMER, /* Khmr */ + PANGO_SCRIPT_LAO, /* Laoo */ + PANGO_SCRIPT_LATIN, /* Latn (Latf, Latg) */ + PANGO_SCRIPT_MALAYALAM, /* Mlym */ + PANGO_SCRIPT_MONGOLIAN, /* Mong */ + PANGO_SCRIPT_MYANMAR, /* Mymr */ + PANGO_SCRIPT_OGHAM, /* Ogam */ + PANGO_SCRIPT_OLD_ITALIC, /* Ital */ + PANGO_SCRIPT_ORIYA, /* Orya */ + PANGO_SCRIPT_RUNIC, /* Runr */ + PANGO_SCRIPT_SINHALA, /* Sinh */ + PANGO_SCRIPT_SYRIAC, /* Syrc (Syrj, Syrn, Syre) */ + PANGO_SCRIPT_TAMIL, /* Taml */ + PANGO_SCRIPT_TELUGU, /* Telu */ + PANGO_SCRIPT_THAANA, /* Thaa */ + PANGO_SCRIPT_THAI, /* Thai */ + PANGO_SCRIPT_TIBETAN, /* Tibt */ + PANGO_SCRIPT_CANADIAN_ABORIGINAL, /* Cans */ + PANGO_SCRIPT_YI, /* Yiii */ + PANGO_SCRIPT_TAGALOG, /* Tglg */ + PANGO_SCRIPT_HANUNOO, /* Hano */ + PANGO_SCRIPT_BUHID, /* Buhd */ + PANGO_SCRIPT_TAGBANWA, /* Tagb */ -#define PANGO_SCRIPT_INVALID_CODE G_UNICODE_SCRIPT_INVALID_CODE -#define PANGO_SCRIPT_COMMON G_UNICODE_SCRIPT_COMMON -#define PANGO_SCRIPT_INHERITED G_UNICODE_SCRIPT_INHERITED -#define PANGO_SCRIPT_ARABIC G_UNICODE_SCRIPT_ARABIC -#define PANGO_SCRIPT_ARMENIAN G_UNICODE_SCRIPT_ARMENIAN -#define PANGO_SCRIPT_BENGALI G_UNICODE_SCRIPT_BENGALI -#define PANGO_SCRIPT_BOPOMOFO G_UNICODE_SCRIPT_BOPOMOFO -#define PANGO_SCRIPT_CHEROKEE G_UNICODE_SCRIPT_CHEROKEE -#define PANGO_SCRIPT_COPTIC G_UNICODE_SCRIPT_COPTIC -#define PANGO_SCRIPT_CYRILLIC G_UNICODE_SCRIPT_CYRILLIC -#define PANGO_SCRIPT_DESERET G_UNICODE_SCRIPT_DESERET -#define PANGO_SCRIPT_DEVANAGARI G_UNICODE_SCRIPT_DEVANAGARI -#define PANGO_SCRIPT_ETHIOPIC G_UNICODE_SCRIPT_ETHIOPIC -#define PANGO_SCRIPT_GEORGIAN G_UNICODE_SCRIPT_GEORGIAN -#define PANGO_SCRIPT_GOTHIC G_UNICODE_SCRIPT_GOTHIC -#define PANGO_SCRIPT_GREEK G_UNICODE_SCRIPT_GREEK -#define PANGO_SCRIPT_GUJARATI G_UNICODE_SCRIPT_GUJARATI -#define PANGO_SCRIPT_GURMUKHI G_UNICODE_SCRIPT_GURMUKHI -#define PANGO_SCRIPT_HAN G_UNICODE_SCRIPT_HAN -#define PANGO_SCRIPT_HANGUL G_UNICODE_SCRIPT_HANGUL -#define PANGO_SCRIPT_HEBREW G_UNICODE_SCRIPT_HEBREW -#define PANGO_SCRIPT_HIRAGANA G_UNICODE_SCRIPT_HIRAGANA -#define PANGO_SCRIPT_KANNADA G_UNICODE_SCRIPT_KANNADA -#define PANGO_SCRIPT_KATAKANA G_UNICODE_SCRIPT_KATAKANA -#define PANGO_SCRIPT_KHMER G_UNICODE_SCRIPT_KHMER -#define PANGO_SCRIPT_LAO G_UNICODE_SCRIPT_LAO -#define PANGO_SCRIPT_LATIN G_UNICODE_SCRIPT_LATIN -#define PANGO_SCRIPT_MALAYALAM G_UNICODE_SCRIPT_MALAYALAM -#define PANGO_SCRIPT_MONGOLIAN G_UNICODE_SCRIPT_MONGOLIAN -#define PANGO_SCRIPT_MYANMAR G_UNICODE_SCRIPT_MYANMAR -#define PANGO_SCRIPT_OGHAM G_UNICODE_SCRIPT_OGHAM -#define PANGO_SCRIPT_OLD_ITALIC G_UNICODE_SCRIPT_OLD_ITALIC -#define PANGO_SCRIPT_ORIYA G_UNICODE_SCRIPT_ORIYA -#define PANGO_SCRIPT_RUNIC G_UNICODE_SCRIPT_RUNIC -#define PANGO_SCRIPT_SINHALA G_UNICODE_SCRIPT_SINHALA -#define PANGO_SCRIPT_SYRIAC G_UNICODE_SCRIPT_SYRIAC -#define PANGO_SCRIPT_TAMIL G_UNICODE_SCRIPT_TAMIL -#define PANGO_SCRIPT_TELUGU G_UNICODE_SCRIPT_TELUGU -#define PANGO_SCRIPT_THAANA G_UNICODE_SCRIPT_THAANA -#define PANGO_SCRIPT_THAI G_UNICODE_SCRIPT_THAI -#define PANGO_SCRIPT_TIBETAN G_UNICODE_SCRIPT_TIBETAN -#define PANGO_SCRIPT_CANADIAN_ABORIGINAL G_UNICODE_SCRIPT_CANADIAN_ABORIGINAL -#define PANGO_SCRIPT_YI G_UNICODE_SCRIPT_YI -#define PANGO_SCRIPT_TAGALOG G_UNICODE_SCRIPT_TAGALOG -#define PANGO_SCRIPT_HANUNOO G_UNICODE_SCRIPT_HANUNOO -#define PANGO_SCRIPT_BUHID G_UNICODE_SCRIPT_BUHID -#define PANGO_SCRIPT_TAGBANWA G_UNICODE_SCRIPT_TAGBANWA -#define PANGO_SCRIPT_BRAILLE G_UNICODE_SCRIPT_BRAILLE -#define PANGO_SCRIPT_CYPRIOT G_UNICODE_SCRIPT_CYPRIOT -#define PANGO_SCRIPT_LIMBU G_UNICODE_SCRIPT_LIMBU -#define PANGO_SCRIPT_OSMANYA G_UNICODE_SCRIPT_OSMANYA -#define PANGO_SCRIPT_SHAVIAN G_UNICODE_SCRIPT_SHAVIAN -#define PANGO_SCRIPT_LINEAR_B G_UNICODE_SCRIPT_LINEAR_B -#define PANGO_SCRIPT_TAI_LE G_UNICODE_SCRIPT_TAI_LE -#define PANGO_SCRIPT_UGARITIC G_UNICODE_SCRIPT_UGARITIC -#define PANGO_SCRIPT_NEW_TAI_LUE G_UNICODE_SCRIPT_NEW_TAI_LUE -#define PANGO_SCRIPT_BUGINESE G_UNICODE_SCRIPT_BUGINESE -#define PANGO_SCRIPT_GLAGOLITIC G_UNICODE_SCRIPT_GLAGOLITIC -#define PANGO_SCRIPT_TIFINAGH G_UNICODE_SCRIPT_TIFINAGH -#define PANGO_SCRIPT_SYLOTI_NAGRI G_UNICODE_SCRIPT_SYLOTI_NAGRI -#define PANGO_SCRIPT_OLD_PERSIAN G_UNICODE_SCRIPT_OLD_PERSIAN -#define PANGO_SCRIPT_KHAROSHTHI G_UNICODE_SCRIPT_KHAROSHTHI -#define PANGO_SCRIPT_UNKNOWN G_UNICODE_SCRIPT_UNKNOWN -#define PANGO_SCRIPT_BALINESE G_UNICODE_SCRIPT_BALINESE -#define PANGO_SCRIPT_CUNEIFORM G_UNICODE_SCRIPT_CUNEIFORM -#define PANGO_SCRIPT_PHOENICIAN G_UNICODE_SCRIPT_PHOENICIAN -#define PANGO_SCRIPT_PHAGS_PA G_UNICODE_SCRIPT_PHAGS_PA -#define PANGO_SCRIPT_NKO G_UNICODE_SCRIPT_NKO -#define PANGO_SCRIPT_KAYAH_LI G_UNICODE_SCRIPT_KAYAH_LI -#define PANGO_SCRIPT_LEPCHA G_UNICODE_SCRIPT_LEPCHA -#define PANGO_SCRIPT_REJANG G_UNICODE_SCRIPT_REJANG -#define PANGO_SCRIPT_SUNDANESE G_UNICODE_SCRIPT_SUNDANESE -#define PANGO_SCRIPT_SAURASHTRA G_UNICODE_SCRIPT_SAURASHTRA -#define PANGO_SCRIPT_CHAM G_UNICODE_SCRIPT_CHAM -#define PANGO_SCRIPT_OL_CHIKI G_UNICODE_SCRIPT_OL_CHIKI -#define PANGO_SCRIPT_VAI G_UNICODE_SCRIPT_VAI -#define PANGO_SCRIPT_CARIAN G_UNICODE_SCRIPT_CARIAN -#define PANGO_SCRIPT_LYCIAN G_UNICODE_SCRIPT_LYCIAN -#define PANGO_SCRIPT_LYDIAN G_UNICODE_SCRIPT_LYDIAN -#define PANGO_SCRIPT_BATAK G_UNICODE_SCRIPT_BATAK -#define PANGO_SCRIPT_BRAHMI G_UNICODE_SCRIPT_BRAHMI -#define PANGO_SCRIPT_MANDAIC G_UNICODE_SCRIPT_MANDAIC -#define PANGO_SCRIPT_CHAKMA G_UNICODE_SCRIPT_CHAKMA -#define PANGO_SCRIPT_MEROITIC_CURSIVE G_UNICODE_SCRIPT_MEROITIC_CURSIVE -#define PANGO_SCRIPT_MEROITIC_HIEROGLYPHS G_UNICODE_SCRIPT_MEROITIC_HIEROGLYPHS -#define PANGO_SCRIPT_MIAO G_UNICODE_SCRIPT_MIAO -#define PANGO_SCRIPT_SHARADA G_UNICODE_SCRIPT_SHARADA -#define PANGO_SCRIPT_SORA_SOMPENG G_UNICODE_SCRIPT_SORA_SOMPENG -#define PANGO_SCRIPT_TAKRI G_UNICODE_SCRIPT_TAKRI -#define PANGO_SCRIPT_BASSA_VAH G_UNICODE_SCRIPT_BASSA_VAH -#define PANGO_SCRIPT_CAUCASIAN_ALBANIAN G_UNICODE_SCRIPT_CAUCASIAN_ALBANIAN -#define PANGO_SCRIPT_DUPLOYAN G_UNICODE_SCRIPT_DUPLOYAN -#define PANGO_SCRIPT_ELBASAN G_UNICODE_SCRIPT_ELBASAN -#define PANGO_SCRIPT_GRANTHA G_UNICODE_SCRIPT_GRANTHA -#define PANGO_SCRIPT_KHOJKI G_UNICODE_SCRIPT_KHOJKI -#define PANGO_SCRIPT_KHUDAWADI G_UNICODE_SCRIPT_KHUDAWADI -#define PANGO_SCRIPT_LINEAR_A G_UNICODE_SCRIPT_LINEAR_A -#define PANGO_SCRIPT_MAHAJANI G_UNICODE_SCRIPT_MAHAJANI -#define PANGO_SCRIPT_MANICHAEAN G_UNICODE_SCRIPT_MANICHAEAN -#define PANGO_SCRIPT_MENDE_KIKAKUI G_UNICODE_SCRIPT_MENDE_KIKAKUI -#define PANGO_SCRIPT_MODI G_UNICODE_SCRIPT_MODI -#define PANGO_SCRIPT_MRO G_UNICODE_SCRIPT_MRO -#define PANGO_SCRIPT_NABATAEAN G_UNICODE_SCRIPT_NABATAEAN -#define PANGO_SCRIPT_OLD_NORTH_ARABIAN G_UNICODE_SCRIPT_OLD_NORTH_ARABIAN -#define PANGO_SCRIPT_OLD_PERMIC G_UNICODE_SCRIPT_OLD_PERMIC -#define PANGO_SCRIPT_PAHAWH_HMONG G_UNICODE_SCRIPT_PAHAWH_HMONG -#define PANGO_SCRIPT_PALMYRENE G_UNICODE_SCRIPT_PALMYRENE -#define PANGO_SCRIPT_PAU_CIN_HAU G_UNICODE_SCRIPT_PAU_CIN_HAU -#define PANGO_SCRIPT_PSALTER_PAHLAVI G_UNICODE_SCRIPT_PSALTER_PAHLAVI -#define PANGO_SCRIPT_SIDDHAM G_UNICODE_SCRIPT_SIDDHAM -#define PANGO_SCRIPT_TIRHUTA G_UNICODE_SCRIPT_TIRHUTA -#define PANGO_SCRIPT_WARANG_CITI G_UNICODE_SCRIPT_WARANG_CITI -#define PANGO_SCRIPT_AHOM G_UNICODE_SCRIPT_AHOM -#define PANGO_SCRIPT_ANATOLIAN_HIEROGLYPHS G_UNICODE_SCRIPT_ANATOLIAN_HIEROGLYPHS -#define PANGO_SCRIPT_HATRAN G_UNICODE_SCRIPT_HATRAN -#define PANGO_SCRIPT_MULTANI G_UNICODE_SCRIPT_MULTANI -#define PANGO_SCRIPT_OLD_HUNGARIAN G_UNICODE_SCRIPT_OLD_HUNGARIAN -#define PANGO_SCRIPT_SIGNWRITING G_UNICODE_SCRIPT_SIGNWRITING + /* Unicode-4.0 additions */ + PANGO_SCRIPT_BRAILLE, /* Brai */ + PANGO_SCRIPT_CYPRIOT, /* Cprt */ + PANGO_SCRIPT_LIMBU, /* Limb */ + PANGO_SCRIPT_OSMANYA, /* Osma */ + PANGO_SCRIPT_SHAVIAN, /* Shaw */ + PANGO_SCRIPT_LINEAR_B, /* Linb */ + PANGO_SCRIPT_TAI_LE, /* Tale */ + PANGO_SCRIPT_UGARITIC, /* Ugar */ + + /* Unicode-4.1 additions */ + PANGO_SCRIPT_NEW_TAI_LUE, /* Talu */ + PANGO_SCRIPT_BUGINESE, /* Bugi */ + PANGO_SCRIPT_GLAGOLITIC, /* Glag */ + PANGO_SCRIPT_TIFINAGH, /* Tfng */ + PANGO_SCRIPT_SYLOTI_NAGRI, /* Sylo */ + PANGO_SCRIPT_OLD_PERSIAN, /* Xpeo */ + PANGO_SCRIPT_KHAROSHTHI, /* Khar */ + + /* Unicode-5.0 additions */ + PANGO_SCRIPT_UNKNOWN, /* Zzzz */ + PANGO_SCRIPT_BALINESE, /* Bali */ + PANGO_SCRIPT_CUNEIFORM, /* Xsux */ + PANGO_SCRIPT_PHOENICIAN, /* Phnx */ + PANGO_SCRIPT_PHAGS_PA, /* Phag */ + PANGO_SCRIPT_NKO, /* Nkoo */ + + /* Unicode-5.1 additions */ + PANGO_SCRIPT_KAYAH_LI, /* Kali */ + PANGO_SCRIPT_LEPCHA, /* Lepc */ + PANGO_SCRIPT_REJANG, /* Rjng */ + PANGO_SCRIPT_SUNDANESE, /* Sund */ + PANGO_SCRIPT_SAURASHTRA, /* Saur */ + PANGO_SCRIPT_CHAM, /* Cham */ + PANGO_SCRIPT_OL_CHIKI, /* Olck */ + PANGO_SCRIPT_VAI, /* Vaii */ + PANGO_SCRIPT_CARIAN, /* Cari */ + PANGO_SCRIPT_LYCIAN, /* Lyci */ + 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 */ + + /* Unicode 7.0 additions */ + PANGO_SCRIPT_BASSA_VAH, /* Bass */ + PANGO_SCRIPT_CAUCASIAN_ALBANIAN, /* Aghb */ + PANGO_SCRIPT_DUPLOYAN, /* Dupl */ + PANGO_SCRIPT_ELBASAN, /* Elba */ + PANGO_SCRIPT_GRANTHA, /* Gran */ + PANGO_SCRIPT_KHOJKI, /* Khoj */ + PANGO_SCRIPT_KHUDAWADI, /* Sind */ + PANGO_SCRIPT_LINEAR_A, /* Lina */ + PANGO_SCRIPT_MAHAJANI, /* Mahj */ + PANGO_SCRIPT_MANICHAEAN, /* Manu */ + PANGO_SCRIPT_MENDE_KIKAKUI, /* Mend */ + PANGO_SCRIPT_MODI, /* Modi */ + PANGO_SCRIPT_MRO, /* Mroo */ + PANGO_SCRIPT_NABATAEAN, /* Nbat */ + PANGO_SCRIPT_OLD_NORTH_ARABIAN, /* Narb */ + PANGO_SCRIPT_OLD_PERMIC, /* Perm */ + PANGO_SCRIPT_PAHAWH_HMONG, /* Hmng */ + PANGO_SCRIPT_PALMYRENE, /* Palm */ + PANGO_SCRIPT_PAU_CIN_HAU, /* Pauc */ + PANGO_SCRIPT_PSALTER_PAHLAVI, /* Phlp */ + PANGO_SCRIPT_SIDDHAM, /* Sidd */ + PANGO_SCRIPT_TIRHUTA, /* Tirh */ + PANGO_SCRIPT_WARANG_CITI, /* Wara */ + + /* Unicode 8.0 additions */ + PANGO_SCRIPT_AHOM, /* Ahom */ + PANGO_SCRIPT_ANATOLIAN_HIEROGLYPHS, /* Hluw */ + PANGO_SCRIPT_HATRAN, /* Hatr */ + PANGO_SCRIPT_MULTANI, /* Mult */ + PANGO_SCRIPT_OLD_HUNGARIAN, /* Hung */ + PANGO_SCRIPT_SIGNWRITING /* Sgnw */ +} PangoScript; #include -- cgit v1.2.1