OCTO-11450-fix-breaks-accumulate-across-caption-boundaries

.gitignore

@@ -38,6 +38,7 @@ docs/_build
 # Environments
 env/
 venv/
+.env
 
 # Pyenv files
 .python-version

docs/conf.py

@@ -32,30 +32,30 @@
 extensions = []
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ["_templates"]
 
 # The suffix of source filenames.
-source_suffix = '.rst'
+source_suffix = ".rst"
 
 # The encoding of source files.
 # source_encoding = 'utf-8-sig'
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = "index"
 
 # General information about the project.
-project = 'pycaption'
-copyright = '2012-2026, PBS.org ' \
-            '(available under the Apache License, Version 2.0)'
+project = "pycaption"
+copyright = "2012-2026, PBS.org " \
+            "(available under the Apache License, Version 2.0)"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '2.2.20'
+version = "2.2.20"
 # The full version, including alpha/beta/rc tags.
-release = '2.2.20'
+release = "2.2.20"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -69,7 +69,7 @@
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['_build']
+exclude_patterns = ["_build"]
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.
@@ -87,7 +87,7 @@
 # show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = "sphinx"
 
 # A list of ignored prefixes for module index sorting.
 # modindex_common_prefix = []
@@ -131,7 +131,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = ["_static"]
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
@@ -180,18 +180,16 @@
 # html_file_suffix = None
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'pycaptiondoc'
+htmlhelp_basename = "pycaptiondoc"
 
 
 # -- Options for LaTeX output ---------------------------------------------
 
 latex_elements = {
     #  The paper size ('letterpaper' or 'a4paper').
     # 'papersize': 'letterpaper',
-
     #  The font size ('10pt', '11pt' or '12pt').
     # 'pointsize': '10pt',
-
     #  Additional stuff for the LaTeX preamble.
     # 'preamble': '',
 }
@@ -200,8 +198,7 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    ('index', 'pycaption.tex', 'pycaption Documentation',
-     'PBS', 'manual'),
+    ("index", "pycaption.tex", "pycaption Documentation", "PBS", "manual"),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -229,10 +226,7 @@
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [
-    ('index', 'pycaption', 'pycaption Documentation',
-     ['PBS'], 1)
-]
+man_pages = [("index", "pycaption", "pycaption Documentation", ["PBS"], 1)]
 
 # If true, show URL addresses after external links.
 # man_show_urls = False
@@ -244,9 +238,15 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    ('index', 'pycaption', 'pycaption Documentation',
-     'PBS', 'pycaption', 'One line description of project.',
-     'Miscellaneous'),
+    (
+        "index",
+        "pycaption",
+        "pycaption Documentation",
+        "PBS",
+        "pycaption",
+        "One line description of project.",
+        "Miscellaneous",
+    ),
 ]
 
 # Documents to append as an appendix to all manuals.

pycaption/__init__.py

@@ -1,30 +1,52 @@
-from .base import (
-    CaptionConverter, CaptionNode, Caption, CaptionList, CaptionSet,
+from .base import Caption, CaptionConverter, CaptionList, CaptionNode, CaptionSet
+from .dfxp import DFXPReader, DFXPWriter
+from .exceptions import (
+    CaptionLineLengthError,
+    CaptionReadError,
+    CaptionReadNoCaptions,
+    CaptionReadSyntaxError,
 )
-from .dfxp import DFXPWriter, DFXPReader
 from .microdvd import MicroDVDReader, MicroDVDWriter
 from .sami import SAMIReader, SAMIWriter
-from .srt import SRTReader, SRTWriter
 from .scc import SCCReader, SCCWriter
 from .scc.translator import translate_scc
+from .srt import SRTReader, SRTWriter
 from .transcript import TranscriptWriter
 from .webvtt import WebVTTReader, WebVTTWriter
-from .exceptions import (
-    CaptionReadError, CaptionReadNoCaptions, CaptionReadSyntaxError, CaptionLineLengthError
-)
-
 
 __all__ = [
-    'CaptionConverter', 'DFXPReader', 'DFXPWriter', 'MicroDVDReader',
-    'MicroDVDWriter', 'SAMIReader', 'SAMIWriter', 'SRTReader', 'SRTWriter',
-    'SCCReader', 'SCCWriter', 'translate_scc', 'WebVTTReader', 'WebVTTWriter',
-    'CaptionReadError', 'CaptionReadNoCaptions', 'CaptionReadSyntaxError',
-    'detect_format', 'CaptionNode', 'Caption', 'CaptionList', 'CaptionSet',
-    'TranscriptWriter'
+    "CaptionConverter",
+    "DFXPReader",
+    "DFXPWriter",
+    "MicroDVDReader",
+    "MicroDVDWriter",
+    "SAMIReader",
+    "SAMIWriter",
+    "SRTReader",
+    "SRTWriter",
+    "SCCReader",
+    "SCCWriter",
+    "translate_scc",
+    "WebVTTReader",
+    "WebVTTWriter",
+    "CaptionReadError",
+    "CaptionReadNoCaptions",
+    "CaptionReadSyntaxError",
+    "detect_format",
+    "CaptionNode",
+    "Caption",
+    "CaptionList",
+    "CaptionSet",
+    "TranscriptWriter",
 ]
 
 SUPPORTED_READERS = (
-    DFXPReader, MicroDVDReader, WebVTTReader, SAMIReader, SRTReader, SCCReader,
+    DFXPReader,
+    MicroDVDReader,
+    WebVTTReader,
+    SAMIReader,
+    SRTReader,
+    SCCReader,
 )
 
 
@@ -36,7 +58,7 @@ def detect_format(caps):
     """
     if not len(caps):
         raise CaptionReadNoCaptions("Empty caption file")
-    
+
     for reader in SUPPORTED_READERS:
         if reader().detect(caps):
             return reader

pycaption/dfxp/__init__.py

@@ -1,2 +1,2 @@
 from .base import *  # noqa: F401, F403
-from .extras import SinglePositioningDFXPWriter, LegacyDFXPWriter  # noqa: F401
+from .extras import LegacyDFXPWriter, SinglePositioningDFXPWriter  # noqa: F401