fixed help message. use xrange rather than range.

diff --git a/jptools/jpBrailleRunner.py b/jptools/jpBrailleRunner.py
index 54371cd..77b989c 100644 (file)
--- a/jptools/jpBrailleRunner.py
+++ b/jptools/jpBrailleRunner.py
@@ -215,7 +215,7 @@ if __name__ == '__main__':
                                          action="store_true",\r
                                          dest="verbose",\r
                                          default="False",\r
-                                         help="pass2 only timeit")\r
+                                         help="pass2 with verbose mode")\r
        parser.add_option("-m", "--makedoc",\r
                                          action="store_true",\r
                                          dest="make_doc",\r

diff --git a/source/synthDrivers/jtalk/translator2.py b/source/synthDrivers/jtalk/translator2.py
index 04bbb6b..13c1d59 100644 (file)
--- a/source/synthDrivers/jtalk/translator2.py
+++ b/source/synthDrivers/jtalk/translator2.py
@@ -125,7 +125,7 @@ class MecabMorph(object):
                                  self.kana, self.yomi, self.accent, self.output, self.sepflag))\r
 \r
 def update_phonetic_symbols(mo):\r
-       for p in range(0, len(mo.yomi)):\r
+       for p in xrange(0, len(mo.yomi)):\r
                # 点訳のてびき第3版 第2章 その1 1 5\r
                # ５、長音の書き表し方 (1), (2)\r
                # before: ああ,ああ,感動詞,*,*,*,アア,アー,1/2,アー,0\r
@@ -344,7 +344,7 @@ def replace_alphabet_morphs(li):
        #  Ｂａｓｉｃ,Basic,名詞,アルファベット,*,*,ビーアシーシー,ビーアシーシー,1/2,Basic\r
        new_li = []\r
        alp_morphs = []\r
-       for pos in range(len(li)):\r
+       for pos in xrange(len(li)):\r
                mo = li[pos]\r
                if pos < len(li) - 1:\r
                        next_mo = li[pos + 1]\r
@@ -673,7 +673,7 @@ def morphs_to_string(li, inbuf, logwrite):
        outbuf = ''\r
        inpos2 = []\r
        p = 0\r
-       for i in range(0, len(li)):\r
+       for i in xrange(0, len(li)):\r
                if not li[i].output:\r
                        continue\r
                out = li[i].output\r
@@ -681,22 +681,22 @@ def morphs_to_string(li, inbuf, logwrite):
                outbuf += out\r
                hyolen = len(li[i].hyouki)\r
                if hyolen == outlen:\r
-                       inpos2.extend(range(p, p + outlen))\r
+                       inpos2.extend(xrange(p, p + outlen))\r
                elif out[:2] == '⠠⠦' and out[-2:] == '⠠⠴':\r
                        # 情報処理用点字の内側\r
                        c = outlen - 4\r
                        inpos2.extend([p] * 2)\r
-                       inpos2.extend(range(p, p + c))\r
+                       inpos2.extend(xrange(p, p + c))\r
                        inpos2.extend([p + c - 1] * 2)\r
                elif out[:1] == '⠦' and out[-1:] == '⠴':\r
                        # 外国語引用符の内側\r
                        c = outlen - 2\r
                        inpos2.extend([p])\r
-                       inpos2.extend(range(p, p + c))\r
+                       inpos2.extend(xrange(p, p + c))\r
                        inpos2.extend([p + c - 1])\r
                else:\r
                        # 表記と出力の文字数が変化する場合\r
-                       for x in range(outlen):\r
+                       for x in xrange(outlen):\r
                                inpos2.append(p + int(float(x) * hyolen / outlen))\r
                p += hyolen\r
                if li[i].sepflag:\r
@@ -723,7 +723,7 @@ def japanese_braille_separate(inbuf, logwrite):
        text = inbuf\r
        if RE_MB_ALPHA_NUM_SPACE.match(text):\r
                outbuf = unicode_normalize(text)\r
-               inpos2 = range(len(outbuf))\r
+               inpos2 = xrange(len(outbuf))\r
                return (outbuf, inpos2)\r
 \r
        # 'あ゛ー' Unicode 正規化されて空白が入るので事前に補正する\r
@@ -793,7 +793,7 @@ def japanese_braille_separate(inbuf, logwrite):
        # after:\r
        # ’,’,記号,括弧閉,*,*,’,’,*/*,',0\r
        # ０,0,名詞,数,*,*,ゼロ,ゼロ,1/2,0,0\r
-       for pos in range(0, len(li) - 1):\r
+       for pos in xrange(0, len(li) - 1):\r
                if li[pos].hyouki == '’' and li[pos+1].hinshi2 == '数':\r
                        li[pos].output = "'"\r
 \r
@@ -806,7 +806,7 @@ def japanese_braille_separate(inbuf, logwrite):
        # 二,二,名詞,数,*,*,2,2,1/2,2,0\r
        # 、,、,記号,読点,*,*,、,、,*/*,⠼,0\r
        # 三,三,名詞,数,*,*,3,3,1/2,3,0\r
-       for pos in range(1, len(li) - 1):\r
+       for pos in xrange(1, len(li) - 1):\r
                if li[pos-1].output.isdigit() and \\r
                                li[pos].hyouki in ('、', '・') and \\r
                                li[pos+1].output.isdigit():\r
@@ -947,7 +947,7 @@ def makeOutPos(inPos, inlen, outlen):
                        outPos[ inPos[p] ] = p\r
        # fill skipped outPos\r
        prev = 0\r
-       for p in range(inlen):\r
+       for p in xrange(inlen):\r
                if outPos[p] == -1:\r
                        outPos[p] = prev\r
                else:\r
@@ -956,7 +956,7 @@ def makeOutPos(inPos, inlen, outlen):
 \r
 def mergePositionMap(inpos1, inpos2, outlen, inlen):\r
        inPos = [0] * outlen\r
-       for p in range(outlen):\r
+       for p in xrange(outlen):\r
                inPos[p] = inpos2[ inpos1[p] ]\r
        outPos = makeOutPos(inPos, inlen, outlen)\r
        return inPos, outPos\r