Merge pull request #338 from olliwang/CJK

Better support for CJK characters.
This commit is contained in:
Mikko Mononen 2016-11-01 20:04:34 +02:00 committed by GitHub
commit e12379653e

View File

@ -2617,7 +2617,12 @@ int nvgTextBreakLines(NVGcontext* ctx, const char* string, const char* end, floa
type = NVG_NEWLINE;
break;
default:
if (iter.codepoint >= 0x4E00 && iter.codepoint <= 0x9FFF)
if (iter.codepoint >= 0x4E00 && iter.codepoint <= 0x9FFF ||
iter.codepoint >= 0x3000 && iter.codepoint <= 0x30FF ||
iter.codepoint >= 0xFF00 && iter.codepoint <= 0xFFEF ||
iter.codepoint >= 0x1100 && iter.codepoint <= 0x11FF ||
iter.codepoint >= 0x3130 && iter.codepoint <= 0x318F ||
iter.codepoint >= 0xAC00 && iter.codepoint <= 0xD7AF)
type = NVG_CJK_CHAR;
else
type = NVG_CHAR;