NVDA with Japanese branch
Revision | 01048e9b47a534a8c7ec4cea0dd450ab4c96afa0 (tree) |
---|---|
Time | 2014-06-09 14:50:34 |
Author | Takuya Nishimoto <nishimotz@gmai...> |
Commiter | Takuya Nishimoto |
ti31182 work in progress. support NABCC + Japanese braille mode
@@ -1,5 +1,5 @@ | ||
1 | 1 | @rem SET VERSION=2014.3jp |
2 | -SET VERSION=jpbeta140602 | |
2 | +SET VERSION=jpbeta140609 | |
3 | 3 | |
4 | 4 | SET DEBUG= |
5 | 5 | @rem SET DEBUG=nvdaHelperDebugFlags=noOptimize,RTC,debugCRT,symbols |
@@ -1 +1 @@ | ||
1 | -Subproject commit 10c88870e428fb04a60bbf4e8161201ee53b335b | |
1 | +Subproject commit 2e2ca9aafc5c3dd21bdaecac616780c4023a9197 |
@@ -386,7 +386,7 @@ class Region(object): | ||
386 | 386 | if config.conf["braille"]["japaneseBrailleSupport"]: |
387 | 387 | log.debug(text) |
388 | 388 | from synthDrivers.jtalk.translator2 import translate as jpTranslate |
389 | - braille, self.brailleToRawPos, self.rawToBraillePos, brailleCursorPos = jpTranslate(text, cursorPos=self.cursorPos or 0) | |
389 | + braille, self.brailleToRawPos, self.rawToBraillePos, brailleCursorPos = jpTranslate(text, cursorPos=self.cursorPos or 0, nabcc=(mode & louis.compbrlAtCursor)) | |
390 | 390 | else: |
391 | 391 | louisTranslationTable = config.conf["braille"]["translationTable"] |
392 | 392 | braille, self.brailleToRawPos, self.rawToBraillePos, brailleCursorPos = louis.translate( |
@@ -8,6 +8,7 @@ | ||
8 | 8 | |
9 | 9 | import wx |
10 | 10 | import gui |
11 | +import config | |
11 | 12 | |
12 | 13 | class brailleViewerFrame(wx.MiniFrame): |
13 | 14 |
@@ -44,7 +45,7 @@ def appendText(text): | ||
44 | 45 | if _guiFrame.FindFocus()==_guiFrame.textCtrl: |
45 | 46 | return |
46 | 47 | translate = __import__("synthDrivers.jtalk.translator2", globals(), locals(), ('getReadingAndBraille',)) |
47 | - (sp, tr) = getattr(translate, 'getReadingAndBraille')(text) | |
48 | + (sp, tr) = getattr(translate, 'getReadingAndBraille')(text, nabcc=config.conf["braille"]["expandAtCursor"]) | |
48 | 49 | if tr: |
49 | 50 | _guiFrame.textCtrl.AppendText(sp+"\n") |
50 | 51 | _guiFrame.textCtrl.AppendText(tr+"\n") |