|
|
@ -2167,7 +2167,8 @@ const ImWchar* ImFontAtlas::GetGlyphRangesChineseFull()
|
|
|
|
static const ImWchar ranges[] =
|
|
|
|
static const ImWchar ranges[] =
|
|
|
|
{
|
|
|
|
{
|
|
|
|
0x0020, 0x00FF, // Basic Latin + Latin Supplement
|
|
|
|
0x0020, 0x00FF, // Basic Latin + Latin Supplement
|
|
|
|
0x3000, 0x30FF, // Punctuations, Hiragana, Katakana
|
|
|
|
0x2000, 0x206F, // General Punctuation
|
|
|
|
|
|
|
|
0x3000, 0x30FF, // CJK Symbols and Punctuations, Hiragana, Katakana
|
|
|
|
0x31F0, 0x31FF, // Katakana Phonetic Extensions
|
|
|
|
0x31F0, 0x31FF, // Katakana Phonetic Extensions
|
|
|
|
0xFF00, 0xFFEF, // Half-width characters
|
|
|
|
0xFF00, 0xFFEF, // Half-width characters
|
|
|
|
0x4e00, 0x9FAF, // CJK Ideograms
|
|
|
|
0x4e00, 0x9FAF, // CJK Ideograms
|
|
|
@ -2243,9 +2244,10 @@ const ImWchar* ImFontAtlas::GetGlyphRangesChineseSimplifiedCommon()
|
|
|
|
static ImWchar base_ranges[] = // not zero-terminated
|
|
|
|
static ImWchar base_ranges[] = // not zero-terminated
|
|
|
|
{
|
|
|
|
{
|
|
|
|
0x0020, 0x00FF, // Basic Latin + Latin Supplement
|
|
|
|
0x0020, 0x00FF, // Basic Latin + Latin Supplement
|
|
|
|
0x3000, 0x30FF, // Punctuations, Hiragana, Katakana
|
|
|
|
0x2000, 0x206F, // General Punctuation
|
|
|
|
|
|
|
|
0x3000, 0x30FF, // CJK Symbols and Punctuations, Hiragana, Katakana
|
|
|
|
0x31F0, 0x31FF, // Katakana Phonetic Extensions
|
|
|
|
0x31F0, 0x31FF, // Katakana Phonetic Extensions
|
|
|
|
0xFF00, 0xFFEF, // Half-width characters
|
|
|
|
0xFF00, 0xFFEF // Half-width characters
|
|
|
|
};
|
|
|
|
};
|
|
|
|
static ImWchar full_ranges[IM_ARRAYSIZE(base_ranges) + IM_ARRAYSIZE(accumulative_offsets_from_0x4E00) * 2 + 1] = { 0 };
|
|
|
|
static ImWchar full_ranges[IM_ARRAYSIZE(base_ranges) + IM_ARRAYSIZE(accumulative_offsets_from_0x4E00) * 2 + 1] = { 0 };
|
|
|
|
if (!full_ranges[0])
|
|
|
|
if (!full_ranges[0])
|
|
|
@ -2301,9 +2303,9 @@ const ImWchar* ImFontAtlas::GetGlyphRangesJapanese()
|
|
|
|
static ImWchar base_ranges[] = // not zero-terminated
|
|
|
|
static ImWchar base_ranges[] = // not zero-terminated
|
|
|
|
{
|
|
|
|
{
|
|
|
|
0x0020, 0x00FF, // Basic Latin + Latin Supplement
|
|
|
|
0x0020, 0x00FF, // Basic Latin + Latin Supplement
|
|
|
|
0x3000, 0x30FF, // Punctuations, Hiragana, Katakana
|
|
|
|
0x3000, 0x30FF, // CJK Symbols and Punctuations, Hiragana, Katakana
|
|
|
|
0x31F0, 0x31FF, // Katakana Phonetic Extensions
|
|
|
|
0x31F0, 0x31FF, // Katakana Phonetic Extensions
|
|
|
|
0xFF00, 0xFFEF, // Half-width characters
|
|
|
|
0xFF00, 0xFFEF // Half-width characters
|
|
|
|
};
|
|
|
|
};
|
|
|
|
static ImWchar full_ranges[IM_ARRAYSIZE(base_ranges) + IM_ARRAYSIZE(accumulative_offsets_from_0x4E00)*2 + 1] = { 0 };
|
|
|
|
static ImWchar full_ranges[IM_ARRAYSIZE(base_ranges) + IM_ARRAYSIZE(accumulative_offsets_from_0x4E00)*2 + 1] = { 0 };
|
|
|
|
if (!full_ranges[0])
|
|
|
|
if (!full_ranges[0])
|
|
|
|