From 491c32179e852d359f9fd73d5e20acca2ade6a70 Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Sat, 20 Apr 2013 17:41:17 +0200 Subject: [PATCH] Korean support --- tools/atlastool.cpp | 49 ++++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/tools/atlastool.cpp b/tools/atlastool.cpp index 0ebc6865c1..c6ecea034b 100644 --- a/tools/atlastool.cpp +++ b/tools/atlastool.cpp @@ -569,19 +569,9 @@ inline bool operator <(const CharRange &a, const CharRange &b) { return a.start < b.start; } -void GetLocales(const char *locales, std::vector &ranges) -{ - std::set kanji; - for (int i = 0; i < sizeof(kanjiFilter)/sizeof(kanjiFilter[0]); i+=2) - { - // TODO: learning level check? - if (kanjiFilter[i+1] > 0) { - kanji.insert(kanjiFilter[i]); - } - } - // Also, load chinese.txt if available. - FILE *f = fopen("chinese.txt", "rb"); +void LearnFile(const char *filename, const char *desc, std::set &chars, int lowerLimit, int upperLimit) { + FILE *f = fopen(filename, "rb"); if (f) { fseek(f, 0, SEEK_END); size_t sz = ftell(f); @@ -595,17 +585,37 @@ void GetLocales(const char *locales, std::vector &ranges) int learnCount = 0; while (!utf.end()) { uint32_t c = utf.next(); - if (c >= 0x3400) { - if (kanji.find(c) == kanji.end()) { + if (c >= lowerLimit && c <= upperLimit) { + if (chars.find(c) == chars.end()) { learnCount++; - kanji.insert(c); + chars.insert(c); } } } delete [] data; - printf("%i Chinese charactes learned.\n", learnCount); + printf("%i %s characters learned.\n", learnCount, desc); } +} + +void GetLocales(const char *locales, std::vector &ranges) +{ + std::set kanji; + std::set hangul1, hangul2, hangul3; + for (int i = 0; i < sizeof(kanjiFilter)/sizeof(kanjiFilter[0]); i+=2) + { + // TODO: learning level check? + if (kanjiFilter[i+1] > 0) { + kanji.insert(kanjiFilter[i]); + } + } + + // Also, load chinese.txt if available. + LearnFile("chinese.txt", "Chinese", kanji, 0x3400, 0xFFFF); + LearnFile("korean.txt", "Korean", hangul1, 0x1100, 0x11FF); + LearnFile("korean.txt", "Korean", hangul2, 0x3130, 0x318F); + LearnFile("korean.txt", "Korean", hangul3, 0xAC00, 0xD7A3); + // The end point of a range is now inclusive! for (size_t i = 0; i < strlen(locales); i++) { @@ -644,12 +654,15 @@ void GetLocales(const char *locales, std::vector &ranges) break; case 'c': // All Kanji, filtered though! ranges.push_back(range(0x3000, 0x303f)); // Ideographic symbols - ranges.push_back(range(0x3400, 0x9FFF, kanji)); - ranges.push_back(range(0xF900, 0xFAFF, kanji)); + ranges.push_back(range(0x4E00, 0x9FFF, kanji)); + // ranges.push_back(range(0xFB00, 0xFAFF, kanji)); break; case 'T': // Thai ranges.push_back(range(0x0E00, 0x0E5B)); break; + case 'K': // Korean (hangul) + ranges.push_back(range(0xAC00, 0xD7A3, hangul3)); + break; } }