fixed regarding outpos

diff --git a/jptools/harness.py b/jptools/harness.py
index 24fed69..0897e4a 100644 (file)
--- a/jptools/harness.py
+++ b/jptools/harness.py
@@ -4249,7 +4249,7 @@ tests = [
                'inpos2': [0,1,2,3,4,5],\r
                'inpos1': [0,0,1,2,3,4,5],\r
                'inpos':  [0,0,1,2,3,4,5],\r
-               'outpos': [1,2,3,4,5,6],\r
+               'outpos': [0,2,3,4,5,6],\r
                'comment': '行末の空白を保存する',\r
                },\r
        {\r
@@ -4268,7 +4268,7 @@ tests = [
                'inpos2': [0,0,1,2],\r
                'inpos1': [0,1,2,3],\r
                'inpos':  [0,0,1,2],\r
-               'outpos': [1,2,3],\r
+               'outpos': [0,2,3],\r
                },\r
        {\r
                'text': '実技 ',\r
@@ -4277,7 +4277,7 @@ tests = [
                'inpos2': [0,0,1,2],\r
                'inpos1': [0,0,1,2,2,3],\r
                'inpos':  [0,0,0,1,1,2],\r
-               'outpos': [2,3,5],\r
+               'outpos': [0,3,5],\r
                },\r
        {\r
                'text': '東京 ',\r
@@ -4286,7 +4286,7 @@ tests = [
                'inpos2': [0,0,0,1,1,2],\r
                'inpos1': [0,1,2,2,4,5],\r
                'inpos':  [0,0,0,0,1,2],\r
-               'outpos': [3,4,5], # FIXME\r
+               'outpos': [0,4,5],\r
                },\r
 \r
        { 'note': '+ 点字表記辞典 +' },\r

diff --git a/source/synthDrivers/jtalk/translator2.py b/source/synthDrivers/jtalk/translator2.py
index a766db8..04bbb6b 100644 (file)
--- a/source/synthDrivers/jtalk/translator2.py
+++ b/source/synthDrivers/jtalk/translator2.py
@@ -1,7 +1,7 @@
 # coding: UTF-8\r
 #translator2.py (Japanese Braille translator Phase 2)\r
 #A part of NonVisual Desktop Access (NVDA)\r
-#Copyright (C) 2012-2013 Takuya Nishimoto (NVDA Japanese Team)\r
+#Copyright (C) 2012-2014 Takuya Nishimoto (NVDA Japanese Team)\r
 #This file is covered by the GNU General Public License.\r
 #See the file COPYING for more details.\r
 \r
@@ -942,8 +942,8 @@ def japaneseToUnicodeBraille(text, logwrite=_logwrite):
 def makeOutPos(inPos, inlen, outlen):\r
        # make outPos\r
        outPos = [-1] * inlen\r
-       for p in range(outlen):\r
-               if inPos[p] < len(outPos) and (outPos[ inPos[p] ] == -1 or inPos[p] == 0):\r
+       for p in xrange(outlen-1, -1, -1):\r
+               if inPos[p] < len(outPos):\r
                        outPos[ inPos[p] ] = p\r
        # fill skipped outPos\r
        prev = 0\r