pycaption 2.3.4__tar.gz → 2.3.5__tar.gz

{pycaption-2.3.4/pycaption.egg-info → pycaption-2.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pycaption
-Version: 2.3.4
+Version: 2.3.5
 Summary: Closed caption converter
 Author: Joe Norton
 Author-email: joey@nortoncrew.com

{pycaption-2.3.4 → pycaption-2.3.5}/pycaption/dfxp/constants.py

@@ -30,7 +30,7 @@ DFXP_DEFAULT_REGION = Layout(
     alignment=Alignment(HorizontalAlignmentEnum.START, VerticalAlignmentEnum.BOTTOM)
 )
 
-# Writer fallback alignment used when layout is None or SCC positional.
+# Writer fallback alignment used when layout is None.
 DFXP_WRITER_FALLBACK_ALIGNMENT = Alignment(
     HorizontalAlignmentEnum.CENTER, VerticalAlignmentEnum.BOTTOM
 )

{pycaption-2.3.4 → pycaption-2.3.5}/pycaption/dfxp/writer.py

@@ -294,8 +294,7 @@ class RegionCreator:
     def _collect_unique_regions(caption_set, ignore_region):
         """Collect all unique Layout objects from the caption set.
 
-        Excludes None, ignore_region (typically the default region), and
-        SCC positional layouts (which map to the default center region).
+        Excludes None and ignore_region (typically the default region).
 
         :type caption_set: CaptionSet
         :param ignore_region: a Layout to exclude from the result
@@ -315,9 +314,6 @@ class RegionCreator:
 
         unique_regions.pop(None, None)
         unique_regions.pop(ignore_region, None)
-        for layout in list(unique_regions):
-            if layout and layout.is_positional_anchor:
-                unique_regions.pop(layout)
         return unique_regions
 
     def _create_unique_regions(self, unique_layouts, dfxp, id_factory):
@@ -432,9 +428,6 @@ class RegionCreator:
             if not layout_info:
                 layout_info = caption_set.layout_info
 
-        if layout_info and layout_info.is_positional_anchor:
-            layout_info = None
-
         region_id = self._region_map.get(layout_info)
         if not region_id:
             region_id = DFXP_DEFAULT_REGION_ID
@@ -506,8 +499,8 @@ def _convert_layout_to_attributes(layout, fallback_alignment=None):
     Maps origin, extent, padding, alignment, and writing_direction to their
     tts: namespace equivalents.
 
-    When layout is None or carries a positional anchor (SCC row/col coords),
-    uses fallback_alignment if provided (per RP 2052-10 center promotion).
+    When layout is None, uses fallback_alignment if provided
+    (per RP 2052-10 center promotion).
 
     :type layout: Layout | None
     :param fallback_alignment: Alignment to use when the layout lacks one.
@@ -521,14 +514,6 @@ def _convert_layout_to_attributes(layout, fallback_alignment=None):
             return _create_external_alignment(fallback_alignment)
         return result
 
-    if layout.is_positional_anchor:
-        if fallback_alignment:
-            result.update(_create_external_alignment(fallback_alignment))
-        writing_mode = _WRITING_DIRECTION_TO_DFXP.get(layout.writing_direction)
-        if writing_mode:
-            result["tts:writingMode"] = writing_mode
-        return result
-
     if layout.origin:
         result["tts:origin"] = layout.origin.to_xml_attribute()
 

{pycaption-2.3.4 → pycaption-2.3.5}/pycaption/geometry.py

@@ -597,7 +597,6 @@ class Layout:
         alignment=None,
         webvtt_positioning=None,
         writing_direction=None,
-        is_positional_anchor=False,
         inherit_from=None,
     ):
         """
@@ -623,11 +622,6 @@ class Layout:
         :type writing_direction: WritingDirectionEnum
         :param writing_direction: WebVTT vertical writing direction (rl or lr).
 
-        :type is_positional_anchor: bool
-        :param is_positional_anchor: True when the origin/alignment describe a
-            coordinate-system anchor point (e.g. SCC row/col positioning) rather
-            than visual text alignment.
-
         :type inherit_from: Layout
         :param inherit_from: A Layout with the positioning parameters to be
             used if not specified by the positioning arguments,
@@ -639,7 +633,6 @@ class Layout:
         self.alignment = alignment
         self.webvtt_positioning = webvtt_positioning
         self.writing_direction = writing_direction
-        self.is_positional_anchor = is_positional_anchor
 
         if inherit_from:
             for attr_name in [
@@ -716,7 +709,6 @@ class Layout:
         params = {
             "alignment": self.alignment,
             "writing_direction": self.writing_direction,
-            "is_positional_anchor": self.is_positional_anchor,
         }
         for attr_name in ["origin", "extent", "padding"]:
             attr = getattr(self, attr_name)
@@ -751,7 +743,6 @@ class Layout:
             padding=self.padding,
             alignment=self.alignment,
             writing_direction=self.writing_direction,
-            is_positional_anchor=self.is_positional_anchor,
         )
 
     def _corrected_extent(self, diff_horizontal, diff_vertical):

{pycaption-2.3.4 → pycaption-2.3.5}/pycaption/sami/writer.py

@@ -131,9 +131,6 @@ class SAMIWriter(BaseWriter):
         if not layout_info:
             return
 
-        if layout_info.is_positional_anchor:
-            return
-
         if layout_info.origin:
             if layout_info.origin.x:
                 parts.append(f"margin-left:{layout_info.origin.x};")
@@ -152,9 +149,6 @@ class SAMIWriter(BaseWriter):
         if not layout_info:
             return "center" if self._promote_center else None
 
-        if layout_info.is_positional_anchor:
-            return "center" if self._promote_center else None
-
         if not layout_info.alignment:
             return "center" if self._promote_center else None
 

{pycaption-2.3.4 → pycaption-2.3.5}/pycaption/scc/specialized_collections.py

@@ -632,7 +632,6 @@ def _get_layout_from_tuple(position_tuple):
     return Layout(
         origin=Point(horizontal, vertical),
         alignment=Alignment(HorizontalAlignmentEnum.LEFT, VerticalAlignmentEnum.TOP),
-        is_positional_anchor=True,
     )
 
 

{pycaption-2.3.4 → pycaption-2.3.5}/pycaption/webvtt/writer.py

@@ -344,9 +344,6 @@ class WebVTTWriter(BaseWriter):
         if not layout:
             return ""
 
-        if layout.is_positional_anchor:
-            return ""
-
         if layout.webvtt_positioning:
             return f" {layout.webvtt_positioning}"
 

{pycaption-2.3.4 → pycaption-2.3.5/pycaption.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pycaption
-Version: 2.3.4
+Version: 2.3.5
 Summary: Closed caption converter
 Author: Joe Norton
 Author-email: joey@nortoncrew.com

{pycaption-2.3.4 → pycaption-2.3.5}/setup.py

@@ -20,7 +20,7 @@ transcript_dependencies = ["nltk==3.10.0"]
 
 setup(
     name="pycaption",
-    version="2.3.4",
+    version="2.3.5",
     description="Closed caption converter",
     long_description=open(README_PATH).read(),
     author="Joe Norton",

{pycaption-2.3.4 → pycaption-2.3.5}/tests/fixtures/webvtt.py

@@ -317,7 +317,7 @@ def sample_webvtt_from_scc_properly_writes_newlines_output():
     return """\
 WEBVTT
 
-00:21:30.000 --> 00:21:34.000
+00:21:30.000 --> 00:21:34.000 align:left position:20% line:83% size:70%
 aa
 bb
 """

{pycaption-2.3.4 → pycaption-2.3.5}/tests/test_sami_conversion.py

@@ -211,10 +211,10 @@ class TestWebVTTtoSAMIStyles(SAMITestingMixIn):
 
 
 class TestSCCtoSAMI(SAMITestingMixIn):
-    def test_scc_to_sami_center_aligned(self, sample_scc_pop_on):
+    def test_scc_to_sami_preserves_positioning(self, sample_scc_pop_on):
         caption_set = SCCReader().read(sample_scc_pop_on)
         result = SAMIWriter().write(caption_set)
 
-        assert "text-align:center;" in result
-        assert "margin-left" not in result
-        assert "margin-top" not in result
+        assert "text-align:left;" in result
+        assert "margin-left:" in result
+        assert "margin-top:" in result

{pycaption-2.3.4 → pycaption-2.3.5}/tests/test_scc_conversion.py

@@ -1,7 +1,5 @@
 import re
 
-import pytest
-
 from pycaption import (
     DFXPWriter,
     SCCReader,
@@ -42,9 +40,8 @@ class TestSCCtoDFXP:
         caption_set = SCCReader().read(sample_scc_multiple_positioning)
         dfxp = DFXPWriter(relativize=False, fit_to_screen=False).write(caption_set)
 
-        assert 'tts:textAlign="center"' in dfxp
-        assert 'tts:textAlign="left"' not in dfxp
-        assert "tts:origin" not in dfxp
+        assert 'tts:textAlign="left"' in dfxp
+        assert "tts:origin" in dfxp
         assert "abab" in dfxp
         assert "ghgh" in dfxp
 
@@ -58,8 +55,7 @@ class TestSCCtoDFXP:
 
         dfxp = DFXPWriter().write(caption_set)
 
-        assert 'tts:textAlign="center"' in dfxp
-        assert 'tts:textAlign="left"' not in dfxp
+        assert 'tts:textAlign="left"' in dfxp
         assert 'tts:fontStyle="italic"' in dfxp
         from bs4 import BeautifulSoup
 
@@ -72,7 +68,7 @@ class TestSCCtoDFXP:
 
         dfxp = DFXPWriter().write(caption_set)
 
-        assert 'tts:textAlign="center"' in dfxp
+        assert 'tts:textAlign="left"' in dfxp
         assert "&" in dfxp
         from bs4 import BeautifulSoup