diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/pinyin.cpp | 6 | ||||
| -rw-r--r-- | src/pinyin.h | 2 |
4 files changed, 11 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1430b79..0fc0cc0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -131,6 +131,8 @@ include_directories( ${PROJECT_SOURCE_DIR}/src/include ${PROJECT_SOURCE_DIR}/src/storage ${PROJECT_SOURCE_DIR}/src/lookup + ${PROJECT_SOURCE_DIR}/utils + ${PROJECT_SOURCE_DIR}/tests ) ######## Subdirectories diff --git a/configure.ac b/configure.ac index 3310616..9559f41 100644 --- a/configure.ac +++ b/configure.ac @@ -3,8 +3,8 @@ m4_define([libpinyin_major_version], [0]) -m4_define([libpinyin_minor_version], [6]) -m4_define([libpinyin_micro_version], [92]) +m4_define([libpinyin_minor_version], [7]) +m4_define([libpinyin_micro_version], [0]) m4_define([libpinyin_abi_current], [2]) m4_define([libpinyin_abi_revision], [0]) diff --git a/src/pinyin.cpp b/src/pinyin.cpp index a6724ae..3223152 100644 --- a/src/pinyin.cpp +++ b/src/pinyin.cpp @@ -315,6 +315,8 @@ bool pinyin_iterator_add_phrase(import_iterator_t * iter, if (ERROR_OK == retval) { token = range.m_range_end; + if ( 0x00000000 == (token & PHRASE_MASK)) + token++; /* parse the pinyin. */ parser.parse(options, keys, key_rests, pinyin, strlen(pinyin)); @@ -1125,8 +1127,10 @@ bool pinyin_get_candidates(pinyin_instance_t * instance, g_array_append_val(candidates, *item); } +#if 0 if (!(retval & SEARCH_CONTINUED)) break; +#endif } g_array_free(items, TRUE); @@ -1499,8 +1503,10 @@ bool pinyin_get_full_pinyin_candidates(pinyin_instance_t * instance, g_array_append_val(candidates, *item); } +#if 0 if (!(retval & SEARCH_CONTINUED)) break; +#endif } g_array_free(items, TRUE); diff --git a/src/pinyin.h b/src/pinyin.h index 87c1d48..bfc13a0 100644 --- a/src/pinyin.h +++ b/src/pinyin.h @@ -481,7 +481,7 @@ typedef ChewingKeyVector PinyinKeyVector; typedef ChewingKeyRestVector PinyinKeyPosVector; -#define LIBPINYIN_FORMAT_VERSION "0.6.92" +#define LIBPINYIN_FORMAT_VERSION "0.7.0" }; |