Merge pull request #334 from pbs/OCTO-11001=space-to-mid-row-codes

OCTO-11001=space-to-mid-row-codes

docs/changelog.rst

@@ -1,5 +1,9 @@
 Changelog
 ---------
+2.2.7
+^^^^^
+- The cursor moves automatically one column to the right after each character or Mid-Row Code received.
+
 2.2.6
 ^^^^^
 - Pass the caption cue time with all error messages.

docs/conf.py

@@ -53,9 +53,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.2.6'
+version = '2.2.6.dev3'
 # The full version, including alpha/beta/rc tags.
-release = '2.2.6'
+release = '2.2.6.dev3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

pycaption/scc/constants.py

@@ -1046,3 +1046,9 @@ def _restructure_bytes_to_position_map(byte_to_pos_map):
      '└': ["+"],
      '┘': ["+"]
 }
+
+MID_ROW_CODES = [
+    "9120", "91a1", "91a2", "9123", "91a4", "9125", "9126",
+    "91a7", "91a8", "9129", "912a", "91ab", "912c", "91ad",
+    "97ae", "972f", "91ae", "912f", "94a8"
+]

pycaption/scc/specialized_collections.py

@@ -8,7 +8,8 @@
 )
 from .constants import (
     PAC_BYTES_TO_POSITIONING_MAP, COMMANDS, PAC_TAB_OFFSET_COMMANDS,
-    MICROSECONDS_PER_CODEWORD, INCONVERTIBLE_TO_ASCII_EXTENDED_CHARS_ASSOCIATION
+    MICROSECONDS_PER_CODEWORD, INCONVERTIBLE_TO_ASCII_EXTENDED_CHARS_ASSOCIATION,
+    MID_ROW_CODES
 )
 
 PopOnCue = collections.namedtuple("PopOnCue", "buffer, start, end")
@@ -254,7 +255,7 @@ def create_and_store(self, node_buffer, start, end=0):
                 layout_info = _get_layout_from_tuple(instruction.position)
                 caption.nodes.append(
                     CaptionNode.create_text(
-                        instruction.get_text(), layout_info=layout_info),
+                        instruction.text, layout_info=layout_info),
                 )
                 caption.layout_info = layout_info
 
@@ -346,6 +347,12 @@ def interpret_command(self, command):
 
         text = COMMANDS.get(command, '')
 
+        if command in MID_ROW_CODES:
+            for node in self._collection[::-1]:
+                if node.is_text_node():
+                    node.text += ' '
+                    break
+
         if 'italic' in text:
             if 'end' not in text:
                 self._collection.append(

setup.py

@@ -24,7 +24,7 @@
 
 setup(
     name='pycaption',
-    version='2.2.6',
+    version='2.2.6.dev3',
     description='Closed caption converter',
     long_description=open(README_PATH).read(),
     author='Joe Norton',

tests/test_scc.py

@@ -206,10 +206,10 @@ def test_skip_extended_characters_ascii_duplicate(
 
     def test_skip_duplicate_tab_offset(self, sample_scc_duplicate_tab_offset):
         expected_lines = [
-            '[Radio reporter]',
-            'The I-10 Santa Monica Freeway',
+            '[Radio reporter] ',
+            'The I-10 Santa Monica Freeway ',
             'westbound is jammed,',
-            'due to a three-car accident',
+            'due to a three-car accident ',
             'blocking lanes 1 and 2',
         ]