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

fix bug caused by deleting wrong line
pbs · May 24, 2024 · e9c99c7 · e9c99c7
2 parents 8425158 + dc6b65c
commit e9c99c7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -1,10 +1,14 @@
 Changelog
 ---------
-2.2.9
+2.2.10
 ^^^^^
 - A space should not be placed before a mid row code if it follows a PAC command or a Tab Offset
 - The backspace command should be treated like other commands and duplicates should be skipped if PAC commands are duplicated
 
+2.2.9
+^^^^^
+- Yanked.
+
 2.2.8
 ^^^^^
 - Honor backspaces on captions in scc files

diff --git a/pycaption/scc/__init__.py b/pycaption/scc/__init__.py
@@ -361,6 +361,7 @@ def _handle_double_command(self, word, pacs_are_doubled):
             doubled_types = doubled_types or word in SPECIAL_CHARS or word in EXTENDED_CHARS
 
         if doubled_types and word == self.last_command:
+            self.last_command = ''
             return True
             # Fix for the <position> <tab offset> <position> <tab offset>
             # repetition

diff --git a/tests/fixtures/dfxp.py b/tests/fixtures/dfxp.py
@@ -920,10 +920,10 @@ def sample_dfxp_from_scc_output():
    <region tts:displayAlign="before" tts:origin="40% 53%" tts:textAlign="left" xml:id="r5"/>
    <region tts:displayAlign="before" tts:origin="70% 17%" tts:textAlign="left" xml:id="r6"/>
    <region tts:displayAlign="before" tts:origin="20% 35%" tts:textAlign="left" xml:id="r7"/>
-   <region tts:displayAlign="before" tts:origin="25% 83%" tts:textAlign="left" xml:id="r8"/>
+   <region tts:displayAlign="before" tts:origin="20% 83%" tts:textAlign="left" xml:id="r8"/>
    <region tts:displayAlign="before" tts:origin="70% 11%" tts:textAlign="left" xml:id="r9"/>
    <region tts:displayAlign="before" tts:origin="40% 41%" tts:textAlign="left" xml:id="r10"/>
-   <region tts:displayAlign="before" tts:origin="25% 71%" tts:textAlign="left" xml:id="r11"/>
+   <region tts:displayAlign="before" tts:origin="20% 71%" tts:textAlign="left" xml:id="r11"/>
   </layout>
  </head>
  <body>

diff --git a/tests/test_scc.py b/tests/test_scc.py
@@ -77,10 +77,10 @@ def test_positioning(self, sample_scc_multiple_positioning):
             ((40.0, UnitEnum.PERCENT), (53.0, UnitEnum.PERCENT)),
             ((70.0, UnitEnum.PERCENT), (17.0, UnitEnum.PERCENT)),
             ((20.0, UnitEnum.PERCENT), (35.0, UnitEnum.PERCENT)),
-            ((25.0, UnitEnum.PERCENT), (83.0, UnitEnum.PERCENT)),
+            ((20.0, UnitEnum.PERCENT), (83.0, UnitEnum.PERCENT)),
             ((70.0, UnitEnum.PERCENT), (11.0, UnitEnum.PERCENT)),
             ((40.0, UnitEnum.PERCENT), (41.0, UnitEnum.PERCENT)),
-            ((25.0, UnitEnum.PERCENT), (71.0, UnitEnum.PERCENT))
+            ((20.0, UnitEnum.PERCENT), (71.0, UnitEnum.PERCENT))
         ]
         actual_positioning = [
             caption_.layout_info.origin.serialized()