Merge pull request #120 from balshetzer/master

merge

Author: balshetzer

README.rst

@@ -36,12 +36,12 @@ Installation
 
 Windows:
 Plover is available for Windows as a compiled executable. The latest 
-version is here: https://github.com/plover/plover/releases/download/v2.5.5/plover.exe
+version is here: https://github.com/plover/plover/releases/download/v2.5.6/plover.exe
 There is no installer, just run the binary 
 
 Mac:
 Plover is available for Mac OSX as an app. Download the dmg from:
-https://github.com/plover/plover/releases/download/v2.5.5/Plover.dmg
+https://github.com/plover/plover/releases/download/v2.5.6/Plover.dmg
 Open the dmg and drag plover to the applications folder to install.
 Before running the application you will also need to 
 Open System Preferences, Open "Universal Access" and check the box next 
@@ -55,9 +55,9 @@ run the following commands::
     cd
     sudo apt-get install python-xlib python-wxgtk2.8 wmctrl python-dev python-pip
     sudo pip install -U appdirs simplejson pyserial
-    wget https://github.com/plover/plover/archive/v2.5.5.tar.gz
-    tar -zxf v2.5.5.tar.gz
-    cd plover-2.5.5
+    wget https://github.com/plover/plover/archive/v2.5.6.tar.gz
+    tar -zxf v2.5.6.tar.gz
+    cd plover-2.5.6
     sudo python setup.py install
 
 Once this is done then you should be able to run plover from the applications menu or from the command line with::

plover/__init__.py

@@ -3,7 +3,7 @@
 
 """Plover: Open Source Stenography Software"""
 
-__version__ = '2.5.5'
+__version__ = '2.5.6'
 __copyright__ = '(C) 2010-2011 Joshua Harlan Lifton'
 __url__ = 'http://stenoknight.com/plover'
 __download_url__ = 'https://github.com/plover/plover'

plover/dictionary/rtfcre_dict.py

@@ -124,7 +124,7 @@ def _re_handle_commands(self, m):
             if style_name.startswith('Contin'):
                 result.append('{^    ^}')
             return ''.join(result)
-        
+
         # Unrecognized commands are ignored.
         return ''
 
@@ -165,6 +165,9 @@ def _re_handle_simple_command_group(self, m):
             # Show unknown punctuation as given.
             return '{^' + contents + '^}'
 
+        if command == 'cxsvatdictflags' and 'N' in contents:
+            return '{-|}'
+        
         # unrecognized commands
         if ignore:
             return ''

plover/dictionary/test_rtfcre_dict.py

@@ -34,6 +34,8 @@ def test_converter(self):
         (r'\cxfc', '{-|}'),
         (r'\cxfl', '{>}'),
         (r'pre\cxfl', 'pre{>}'),
+        (r'{\*\cxsvatdictflags N}', '{-|}'),
+        (r'{\*\cxsvatdictflags LN1}', '{-|}'),
         (r'\par', '{#Return}{#Return}'),
         # caseCATalyst declares new styles without a preceding \par so we treat
         # it as an implicit par.

plover/oslayer/winkeyboardcontrol.py

@@ -25,7 +25,7 @@
 from pywinauto.SendKeysCtypes import SendKeys as _SendKeys
 
 def SendKeys(s):
-    _SendKeys(s, with_spaces=True)
+    _SendKeys(s, with_spaces=True, pause=0)
 
 # For the purposes of this class, we'll only report key presses that
 # result in these outputs in order to exclude special key combos.