diff options
| author | Peng Wu <alexepico@gmail.com> | 2013-08-13 20:37:28 +0800 |
|---|---|---|
| committer | Peng Wu <alexepico@gmail.com> | 2013-08-13 20:37:28 +0800 |
| commit | d2b4b823d72307104a40b6d8f5b01eb8917ffcf4 (patch) | |
| tree | fe434a75f22cfabd7b29dca3fe3d53f26be342dc /scripts | |
| parent | b2ee67b413ff9d0bca6fb92ce089c7cdd459ceb0 (diff) | |
| download | libzhuyin-d2b4b823d72307104a40b6d8f5b01eb8917ffcf4.tar.gz libzhuyin-d2b4b823d72307104a40b6d8f5b01eb8917ffcf4.tar.xz libzhuyin-d2b4b823d72307104a40b6d8f5b01eb8917ffcf4.zip | |
fixes genpinyintable.py
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/genpinyintable.py | 14 | ||||
| -rw-r--r-- | scripts/pinyintable.py | 4 |
2 files changed, 8 insertions, 10 deletions
diff --git a/scripts/genpinyintable.py b/scripts/genpinyintable.py index d93b81c..b9f46df 100644 --- a/scripts/genpinyintable.py +++ b/scripts/genpinyintable.py @@ -35,15 +35,13 @@ second_bopomofo_index = [] #pinyin table def filter_pinyin_list(): for (pinyin, bopomofo, flags, chewing) in gen_pinyin_list(): - (luoma, second) = ("" , "") + (luoma, second) = (None, None) if bopomofo in BOPOMOFO_LUOMA_PINYIN_MAP: luoma = BOPOMOFO_LUOMA_PINYIN_MAP[bopomofo] - flags.append("IS_LUOMA_PINYIN") if bopomofo in BOPOMOFO_SECOND_BOPOMOFO_MAP: second = BOPOMOFO_SECOND_BOPOMOFO_MAP[bopomofo] - flags.append("IS_SECOND_BOPOMOFO") flags = '|'.join(flags) chewing = "ChewingKey({0})".format(', '.join(chewing)) @@ -51,14 +49,14 @@ def filter_pinyin_list(): content_table.append((pinyin, bopomofo, luoma, second, chewing)) - if "IS_HANYU_PINYIN" in flags: + if "IS_PINYIN" in flags: hanyu_pinyin_index.append((pinyin, flags)) - if "IS_LUOMA_PINYIN" in flags: - luoma_pinyin_index.append((luoma, flags)) + if luoma: + luoma_pinyin_index.append((luoma, "IS_PINYIN")) if "IS_BOPOMOFO" in flags: bopomofo_index.append((bopomofo, flags)) - if "IS_SECOND_BOPOMOFO" in flags: - second_bopomofo_index.append((second, flags)) + if second: + second_bopomofo_index.append((second, "IS_PINYIN")) def sort_all(): diff --git a/scripts/pinyintable.py b/scripts/pinyintable.py index cf74950..c466a28 100644 --- a/scripts/pinyintable.py +++ b/scripts/pinyintable.py @@ -98,7 +98,7 @@ def gen_pinyins(): flags.append("IS_BOPOMOFO") if pinyin_key in pinyin.HANYU_PINYIN_LIST or \ pinyin_key in pinyin.SHENGMU_LIST: - flags.append("IS_HANYU_PINYIN") + flags.append("IS_PINYIN") if pinyin_key in shengmu_list: flags.append("PINYIN_INCOMPLETE") chewing_key = bopomofo.HANYU_PINYIN_BOPOMOFO_MAP[pinyin_key] @@ -123,7 +123,7 @@ def gen_shengmu(): for shengmu in shengmu_list: if shengmu in pinyin_list: continue - flags = ["IS_HANYU_PINYIN", "PINYIN_INCOMPLETE"] + flags = ["IS_PINYIN", "PINYIN_INCOMPLETE"] chewing_key = get_shengmu_chewing(shengmu) chewing_initial = chewing_key[0] if chewing_initial in chewing.ASCII_CHEWING_INITIAL_MAP: |