| 修訂 | 759830bf8152a4d71dd6cc6a0497e07fc4ed9dd0 (tree) |
|---|---|
| 時間 | 2014-01-05 10:00:06 |
| 作者 |  Takuya Nishimoto <nishimotz@gmai...> |
| Commiter | Takuya Nishimoto |
fixed help message. use xrange rather than range.
jptools/jpBrailleRunner.py (diff) source/synthDrivers/jtalk/translator2.py (diff)| @@ -215,7 +215,7 @@ if __name__ == '__main__': | ||
| 215 | 215 | action="store_true", |
| 216 | 216 | dest="verbose", |
| 217 | 217 | default="False", |
| 218 | - help="pass2 only timeit") | |
| 218 | + help="pass2 with verbose mode") | |
| 219 | 219 | parser.add_option("-m", "--makedoc", |
| 220 | 220 | action="store_true", |
| 221 | 221 | dest="make_doc", |
| @@ -125,7 +125,7 @@ class MecabMorph(object): | ||
| 125 | 125 | self.kana, self.yomi, self.accent, self.output, self.sepflag)) |
| 126 | 126 | |
| 127 | 127 | def update_phonetic_symbols(mo): |
| 128 | - for p in range(0, len(mo.yomi)): | |
| 128 | + for p in xrange(0, len(mo.yomi)): | |
| 129 | 129 | # 点訳のてびき第3版 第2章 その1 1 5 |
| 130 | 130 | # ５、長音の書き表し方 (1), (2) |
| 131 | 131 | # before: ああ,ああ,感動詞,*,*,*,アア,アー,1/2,アー,0 |
| @@ -344,7 +344,7 @@ def replace_alphabet_morphs(li): | ||
| 344 | 344 | # Ｂａｓｉｃ,Basic,名詞,アルファベット,*,*,ビーアシーシー,ビーアシーシー,1/2,Basic |
| 345 | 345 | new_li = [] |
| 346 | 346 | alp_morphs = [] |
| 347 | - for pos in range(len(li)): | |
| 347 | + for pos in xrange(len(li)): | |
| 348 | 348 | mo = li[pos] |
| 349 | 349 | if pos < len(li) - 1: |
| 350 | 350 | next_mo = li[pos + 1] |
| @@ -673,7 +673,7 @@ def morphs_to_string(li, inbuf, logwrite): | ||
| 673 | 673 | outbuf = '' |
| 674 | 674 | inpos2 = [] |
| 675 | 675 | p = 0 |
| 676 | - for i in range(0, len(li)): | |
| 676 | + for i in xrange(0, len(li)): | |
| 677 | 677 | if not li[i].output: |
| 678 | 678 | continue |
| 679 | 679 | out = li[i].output |
| @@ -681,22 +681,22 @@ def morphs_to_string(li, inbuf, logwrite): | ||
| 681 | 681 | outbuf += out |
| 682 | 682 | hyolen = len(li[i].hyouki) |
| 683 | 683 | if hyolen == outlen: |
| 684 | - inpos2.extend(range(p, p + outlen)) | |
| 684 | + inpos2.extend(xrange(p, p + outlen)) | |
| 685 | 685 | elif out[:2] == '⠠⠦' and out[-2:] == '⠠⠴': |
| 686 | 686 | # 情報処理用点字の内側 |
| 687 | 687 | c = outlen - 4 |
| 688 | 688 | inpos2.extend([p] * 2) |
| 689 | - inpos2.extend(range(p, p + c)) | |
| 689 | + inpos2.extend(xrange(p, p + c)) | |
| 690 | 690 | inpos2.extend([p + c - 1] * 2) |
| 691 | 691 | elif out[:1] == '⠦' and out[-1:] == '⠴': |
| 692 | 692 | # 外国語引用符の内側 |
| 693 | 693 | c = outlen - 2 |
| 694 | 694 | inpos2.extend([p]) |
| 695 | - inpos2.extend(range(p, p + c)) | |
| 695 | + inpos2.extend(xrange(p, p + c)) | |
| 696 | 696 | inpos2.extend([p + c - 1]) |
| 697 | 697 | else: |
| 698 | 698 | # 表記と出力の文字数が変化する場合 |
| 699 | - for x in range(outlen): | |
| 699 | + for x in xrange(outlen): | |
| 700 | 700 | inpos2.append(p + int(float(x) * hyolen / outlen)) |
| 701 | 701 | p += hyolen |
| 702 | 702 | if li[i].sepflag: |
| @@ -723,7 +723,7 @@ def japanese_braille_separate(inbuf, logwrite): | ||
| 723 | 723 | text = inbuf |
| 724 | 724 | if RE_MB_ALPHA_NUM_SPACE.match(text): |
| 725 | 725 | outbuf = unicode_normalize(text) |
| 726 | - inpos2 = range(len(outbuf)) | |
| 726 | + inpos2 = xrange(len(outbuf)) | |
| 727 | 727 | return (outbuf, inpos2) |
| 728 | 728 | |
| 729 | 729 | # 'あ゛ー' Unicode 正規化されて空白が入るので事前に補正する |
| @@ -793,7 +793,7 @@ def japanese_braille_separate(inbuf, logwrite): | ||
| 793 | 793 | # after: |
| 794 | 794 | # ’,’,記号,括弧閉,*,*,’,’,*/*,',0 |
| 795 | 795 | # ０,0,名詞,数,*,*,ゼロ,ゼロ,1/2,0,0 |
| 796 | - for pos in range(0, len(li) - 1): | |
| 796 | + for pos in xrange(0, len(li) - 1): | |
| 797 | 797 | if li[pos].hyouki == '’' and li[pos+1].hinshi2 == '数': |
| 798 | 798 | li[pos].output = "'" |
| 799 | 799 |
| @@ -806,7 +806,7 @@ def japanese_braille_separate(inbuf, logwrite): | ||
| 806 | 806 | # 二,二,名詞,数,*,*,2,2,1/2,2,0 |
| 807 | 807 | # 、,、,記号,読点,*,*,、,、,*/*,⠼,0 |
| 808 | 808 | # 三,三,名詞,数,*,*,3,3,1/2,3,0 |
| 809 | - for pos in range(1, len(li) - 1): | |
| 809 | + for pos in xrange(1, len(li) - 1): | |
| 810 | 810 | if li[pos-1].output.isdigit() and \ |
| 811 | 811 | li[pos].hyouki in ('、', '・') and \ |
| 812 | 812 | li[pos+1].output.isdigit(): |
| @@ -947,7 +947,7 @@ def makeOutPos(inPos, inlen, outlen): | ||
| 947 | 947 | outPos[ inPos[p] ] = p |
| 948 | 948 | # fill skipped outPos |
| 949 | 949 | prev = 0 |
| 950 | - for p in range(inlen): | |
| 950 | + for p in xrange(inlen): | |
| 951 | 951 | if outPos[p] == -1: |
| 952 | 952 | outPos[p] = prev |
| 953 | 953 | else: |
| @@ -956,7 +956,7 @@ def makeOutPos(inPos, inlen, outlen): | ||
| 956 | 956 | |
| 957 | 957 | def mergePositionMap(inpos1, inpos2, outlen, inlen): |
| 958 | 958 | inPos = [0] * outlen |
| 959 | - for p in range(outlen): | |
| 959 | + for p in xrange(outlen): | |
| 960 | 960 | inPos[p] = inpos2[ inpos1[p] ] |
| 961 | 961 | outPos = makeOutPos(inPos, inlen, outlen) |
| 962 | 962 | return inPos, outPos |
Screen Reader NVDA Japanese
Fork