From afc23a5617d868f7ba84fcfd1c0e6875053fb091 Mon Sep 17 00:00:00 2001 From: ocornut Date: Sun, 8 Mar 2015 13:28:44 +0000 Subject: [PATCH] Tidying up & Chinese glyph range includes missing punctuation. --- imgui.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/imgui.cpp b/imgui.cpp index 65f08d7be..727adcf10 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -7559,8 +7559,7 @@ const ImWchar* ImFontAtlas::GetGlyphRangesChinese() static const ImWchar ranges[] = { 0x0020, 0x00FF, // Basic Latin + Latin Supplement - 0x3000, 0x3000, // Ideographic Space - 0x3040, 0x30FF, // Hiragana, Katakana + 0x3000, 0x30FF, // Punctuations, Hiragana, Katakana 0x31F0, 0x31FF, // Katakana Phonetic Extensions 0xFF00, 0xFFEF, // Half-width characters 0x4e00, 0x9FAF, // CJK Ideograms @@ -7609,11 +7608,10 @@ const ImWchar* ImFontAtlas::GetGlyphRangesJapanese() 109,2,18,23,0,0,9,61,3,0,28,41,77,27,19,17,81,5,2,14,5,83,57,252,14,154,263,14,20,8,13,6,57,39,38, }; static int ranges_unpacked = false; - static ImWchar ranges[10 + IM_ARRAYSIZE(offsets_from_0x4E00)*2 + 1] = + static ImWchar ranges[8 + IM_ARRAYSIZE(offsets_from_0x4E00)*2 + 1] = { 0x0020, 0x00FF, // Basic Latin + Latin Supplement - 0x3000, 0x303F, // Ideographic Space, Japanese Punctuations - 0x3040, 0x30FF, // Hiragana, Katakana + 0x3000, 0x30FF, // Punctuations, Hiragana, Katakana 0x31F0, 0x31FF, // Katakana Phonetic Extensions 0xFF00, 0xFFEF, // Half-width characters }; @@ -7621,7 +7619,7 @@ const ImWchar* ImFontAtlas::GetGlyphRangesJapanese() { // Unpack int codepoint = 0x4e00; - ImWchar* dst = &ranges[10]; + ImWchar* dst = &ranges[8]; for (int n = 0; n < IM_ARRAYSIZE(offsets_from_0x4E00); n++, dst += 2) dst[0] = dst[1] = (ImWchar)(codepoint += (offsets_from_0x4E00[n] + 1)); dst[0] = 0;