diff options
| -rw-r--r-- | chrome/third_party/hunspell/google/bdict.h | 4 | ||||
| -rw-r--r-- | chrome/third_party/hunspell/google/bdict_writer.cc | 4 | ||||
| -rw-r--r-- | chrome/tools/convert_dict/aff_reader.cc | 16 |
3 files changed, 20 insertions, 4 deletions
diff --git a/chrome/third_party/hunspell/google/bdict.h b/chrome/third_party/hunspell/google/bdict.h index b96a2e4..3157616 100644 --- a/chrome/third_party/hunspell/google/bdict.h +++ b/chrome/third_party/hunspell/google/bdict.h @@ -98,6 +98,10 @@ class BDict { public: // File header. enum { SIGNATURE = 0x63694442 }; + enum { + MAJOR_VERSION = 1, + MINOR_VERSION = 1 + }; struct Header { uint32 signature; diff --git a/chrome/third_party/hunspell/google/bdict_writer.cc b/chrome/third_party/hunspell/google/bdict_writer.cc index 67be677..fcb060d 100644 --- a/chrome/third_party/hunspell/google/bdict_writer.cc +++ b/chrome/third_party/hunspell/google/bdict_writer.cc @@ -451,8 +451,8 @@ std::string BDictWriter::GetBDict() const { hunspell::BDict::Header* header = reinterpret_cast<hunspell::BDict::Header*>(&ret[0]); header->signature = hunspell::BDict::SIGNATURE; - header->major_version = 1; - header->minor_version = 0; + header->major_version = hunspell::BDict::MAJOR_VERSION; + header->minor_version = hunspell::BDict::MINOR_VERSION; header->aff_offset = static_cast<uint32>(aff_offset); header->dic_offset = static_cast<uint32>(dic_offset); diff --git a/chrome/tools/convert_dict/aff_reader.cc b/chrome/tools/convert_dict/aff_reader.cc index 06ec131..ea797fb 100644 --- a/chrome/tools/convert_dict/aff_reader.cc +++ b/chrome/tools/convert_dict/aff_reader.cc @@ -190,11 +190,20 @@ void AffReader::AddAffix(std::string* rule) { // will re-encode the number on the first line, but that will be a NOP. If // there are not that many groups, we won't reencode it, but pass it through. int found_spaces = 0; + std::string token; for (size_t i = 0; i < rule->length(); i++) { if ((*rule)[i] == ' ') { found_spaces++; if (found_spaces == 3) { - std::string part = rule->substr(i); // From here to end. + size_t part_start = i; + std::string part; + if (token[0] != 'Y' && token[0] != 'N') { + // This token represents a stripping prefix or suffix, which is + // either a length or a string to be replaced. + // We also reencode them to UTF-8. + part_start = i - token.length(); + } + part = rule->substr(part_start); // From here to end. size_t slash_index = part.find('/'); if (slash_index != std::string::npos && !has_indexed_affixes()) { @@ -233,9 +242,12 @@ void AffReader::AddAffix(std::string* rule) { if (!EncodingToUTF8(part, &reencoded)) break; - *rule = rule->substr(0, i) + reencoded; + *rule = rule->substr(0, part_start) + reencoded; break; } + token.clear(); + } else { + token.push_back((*rule)[i]); } } |