diff --git a/honoka/src/skkdic.cpp b/honoka/src/skkdic.cpp index d43bdb0..4aea4e7 100644 --- a/honoka/src/skkdic.cpp +++ b/honoka/src/skkdic.cpp @@ -83,13 +83,13 @@ vector dic; for(unsigned int i = 1;i < sList.size();i ++) { SKKDicEntry e; - /*for(unsigned int j = 0;j < sList[i].size();j ++) { + for(unsigned int j = 0;j < sList[i].size();j ++) { if ((sList[i][j] == utf8_mbstowcs(String(";"))[0]) && ((j + 1) < sList[i].size()) && (j > 0)) { - e.kouho = sList[i].substr(0,j - 1); + e.kouho = sList[i].substr(0,j); e.annotation = sList[i].substr(j + 1); } } - if (!e.annotation.length())*/ e.kouho = sList[i]; + if (!e.annotation.length()) e.kouho = sList[i]; dic.push_back(e); } dic_data.insert(pair >(sList[0],dic)); diff --git a/honoka/src/skkdicconversion.cpp b/honoka/src/skkdicconversion.cpp index 81b5deb..54e4221 100644 --- a/honoka/src/skkdicconversion.cpp +++ b/honoka/src/skkdicconversion.cpp @@ -111,6 +111,9 @@ vector es = dic->find(buns[p]); for(unsigned int i = 0;i < es.size();i ++) { e.kanji = es[i].kouho; + if (es[i].annotation.length()) { + e.label = es[i].kouho + utf8_mbstowcs(" (") + es[i].annotation + utf8_mbstowcs(")"); + } list.kouho.push_back(e); } list.count = list.kouho.size();