port commit a15d24e, fixes sillsdev/serval#449

machine/corpora/paratext_project_text_updater_base.py

@@ -1,5 +1,4 @@
 from abc import ABC, abstractmethod
-from pathlib import Path
 from typing import BinaryIO, List, Optional, Tuple, Union
 
 from machine.corpora.paratext_project_settings import ParatextProjectSettings

machine/corpora/scripture_ref_usfm_parser_handler.py

@@ -120,6 +120,9 @@ def text(self, state: UsfmParserState, text: str) -> None:
         if text.strip():
             self._check_convert_verse_para_to_non_verse(state)
 
+    def opt_break(self, state: UsfmParserState) -> None:
+        self._check_convert_verse_para_to_non_verse(state)
+
     def start_char(
         self, state: UsfmParserState, marker: str, unknown: bool, attributes: Optional[Sequence[UsfmAttribute]]
     ) -> None:

tests/corpora/test_usfm_memory_text.py

@@ -74,6 +74,21 @@ def test_get_rows_triplicate_verse() -> None:
     assert rows[4].text == "Second verse"
 
 
+def test_get_rows_opt_break_middle_include_markers() -> None:
+    rows: List[TextRow] = get_rows(
+        r"""\id MAT - Test
+\c 1
+\v 1 First verse in line // More text
+\c 2
+\v 1
+""",
+        include_all_text=True,
+        include_markers=True,
+    )
+    assert len(rows) == 2, str.join(",", [tr.text for tr in rows])
+    assert rows[0].text == "First verse in line // More text"
+
+
 def test_get_rows_verse_para_beginning_non_verse_segment() -> None:
     # a verse paragraph that begins with a non-verse segment followed by a verse segment
     rows: List[TextRow] = get_rows(