Remove deprecated eastasian_width
This commit is contained in:
parent
47030b1855
commit
eed737f672
@ -202,13 +202,7 @@ hb_glib_unicode_combining_class (hb_unicode_funcs_t *ufuncs HB_UNUSED,
|
||||
return (hb_unicode_combining_class_t) g_unichar_combining_class (unicode);
|
||||
}
|
||||
|
||||
static unsigned int
|
||||
hb_glib_unicode_eastasian_width (hb_unicode_funcs_t *ufuncs HB_UNUSED,
|
||||
hb_codepoint_t unicode,
|
||||
void *user_data HB_UNUSED)
|
||||
{
|
||||
return g_unichar_iswide (unicode) ? 2 : 1;
|
||||
}
|
||||
#define hb_glib_unicode_eastasian_width nullptr
|
||||
|
||||
static hb_unicode_general_category_t
|
||||
hb_glib_unicode_general_category (hb_unicode_funcs_t *ufuncs HB_UNUSED,
|
||||
|
@ -73,24 +73,7 @@ hb_icu_unicode_combining_class (hb_unicode_funcs_t *ufuncs HB_UNUSED,
|
||||
return (hb_unicode_combining_class_t) u_getCombiningClass (unicode);
|
||||
}
|
||||
|
||||
static unsigned int
|
||||
hb_icu_unicode_eastasian_width (hb_unicode_funcs_t *ufuncs HB_UNUSED,
|
||||
hb_codepoint_t unicode,
|
||||
void *user_data HB_UNUSED)
|
||||
{
|
||||
switch (u_getIntPropertyValue(unicode, UCHAR_EAST_ASIAN_WIDTH))
|
||||
{
|
||||
case U_EA_WIDE:
|
||||
case U_EA_FULLWIDTH:
|
||||
return 2;
|
||||
case U_EA_NEUTRAL:
|
||||
case U_EA_AMBIGUOUS:
|
||||
case U_EA_HALFWIDTH:
|
||||
case U_EA_NARROW:
|
||||
return 1;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
#define hb_icu_unicode_eastasian_width nullptr
|
||||
|
||||
static hb_unicode_general_category_t
|
||||
hb_icu_unicode_general_category (hb_unicode_funcs_t *ufuncs HB_UNUSED,
|
||||
|
@ -182,14 +182,7 @@ hb_ucdn_combining_class(hb_unicode_funcs_t *ufuncs HB_UNUSED,
|
||||
return (hb_unicode_combining_class_t) ucdn_get_combining_class(unicode);
|
||||
}
|
||||
|
||||
static unsigned int
|
||||
hb_ucdn_eastasian_width(hb_unicode_funcs_t *ufuncs HB_UNUSED,
|
||||
hb_codepoint_t unicode,
|
||||
void *user_data HB_UNUSED)
|
||||
{
|
||||
int w = ucdn_get_east_asian_width(unicode);
|
||||
return (w == UCDN_EAST_ASIAN_F || w == UCDN_EAST_ASIAN_W) ? 2 : 1;
|
||||
}
|
||||
#define hb_ucdn_eastasian_width nullptr
|
||||
|
||||
static hb_unicode_general_category_t
|
||||
hb_ucdn_general_category(hb_unicode_funcs_t *ufuncs HB_UNUSED,
|
||||
|
@ -160,69 +160,6 @@ static const test_pair_t combining_class_tests_more[] =
|
||||
{ 0x111111, 0 }
|
||||
};
|
||||
|
||||
static const test_pair_t eastasian_width_tests[] =
|
||||
{
|
||||
/* Neutral */
|
||||
{ 0x0000, 1 },
|
||||
{ 0x0483, 1 },
|
||||
{ 0x0641, 1 },
|
||||
{ 0xFFFC, 1 },
|
||||
{ 0x10000, 1 },
|
||||
{ 0xE0001, 1 },
|
||||
|
||||
/* Narrow */
|
||||
{ 0x0020, 1 },
|
||||
{ 0x0041, 1 },
|
||||
{ 0x27E6, 1 },
|
||||
|
||||
/* Halfwidth */
|
||||
{ 0x20A9, 1 },
|
||||
{ 0xFF61, 1 },
|
||||
{ 0xFF69, 1 },
|
||||
{ 0xFFEE, 1 },
|
||||
|
||||
/* Ambiguous */
|
||||
{ 0x00A1, 1 },
|
||||
{ 0x00D8, 1 },
|
||||
{ 0x02DD, 1 },
|
||||
{ 0xE0100, 1 },
|
||||
{ 0x100000, 1 },
|
||||
|
||||
/* Fullwidth */
|
||||
{ 0x3000, 2 },
|
||||
{ 0xFF60, 2 },
|
||||
|
||||
/* Wide */
|
||||
{ 0x2329, 2 },
|
||||
{ 0x3001, 2 },
|
||||
{ 0xFE69, 2 },
|
||||
{ 0x30000, 2 },
|
||||
{ 0x3FFFD, 2 },
|
||||
|
||||
{ 0x111111, 1 }
|
||||
};
|
||||
static const test_pair_t eastasian_width_tests_more[] =
|
||||
{
|
||||
/* Default Wide blocks */
|
||||
{ 0x4DBF, 2 },
|
||||
{ 0x9FFF, 2 },
|
||||
{ 0xFAFF, 2 },
|
||||
{ 0x2A6DF, 2 },
|
||||
{ 0x2B73F, 2 },
|
||||
{ 0x2B81F, 2 },
|
||||
{ 0x2FA1F, 2 },
|
||||
|
||||
/* Uniode-5.2 character additions */
|
||||
/* Wide */
|
||||
{ 0x115F, 2 },
|
||||
|
||||
/* Uniode-6.0 character additions */
|
||||
/* Wide */
|
||||
{ 0x2B740, 2 },
|
||||
{ 0x1B000, 2 },
|
||||
|
||||
{ 0x111111, 1 }
|
||||
};
|
||||
|
||||
static const test_pair_t general_category_tests[] =
|
||||
{
|
||||
@ -469,7 +406,6 @@ typedef struct {
|
||||
static const property_t properties[] =
|
||||
{
|
||||
PROPERTY (combining_class, 0),
|
||||
PROPERTY (eastasian_width, 1),
|
||||
PROPERTY (general_category, (unsigned int) HB_UNICODE_GENERAL_CATEGORY_OTHER_LETTER),
|
||||
PROPERTY (mirroring, RETURNS_UNICODE_ITSELF),
|
||||
PROPERTY (script, (unsigned int) HB_SCRIPT_UNKNOWN)
|
||||
|
Loading…
Reference in New Issue
Block a user