more fixes

Author: johnml1135

machine/corpora/scripture_ref_usfm_parser_handler.py

@@ -116,7 +116,7 @@ def start_note(self, state: UsfmParserState, marker: str, caller: str, category:
 
     def end_note(self, state: UsfmParserState, marker: str, closed: bool) -> None:
         self.end_note_text(state)
-        self.end_embed(state, marker, "", closed)
+        self.end_embed(state, marker, None, closed)
         self._in_embed = False
 
     def start_embed(self, state: UsfmParserState, marker: str, caller: str, category: Optional[str]) -> None:

tests/corpora/test_update_usfm_parser_handler.py

@@ -124,7 +124,8 @@ def test_get_usfm_verse_preserve_figures_and_references() -> None:
     target = update_usfm(rows)
     assert target is not None
     assert (
-        '\\v 5 Fifth verse of the first chapter.\r\n\\li2 \\fig Figure 1|src="image1.png" size="col" ref="1:5"\\fig*\r\n\\v 6'
+        '\\v 5 Fifth verse of the first chapter.\r\n\\li2 \\fig Figure 1|src="image1.png" size="col" ref="1:5"'
+        + "\\fig*\r\n\\v 6"
         in target
     )
     assert "\\r (Mark 1:2-3; Luke 4:5-6)\r\n" in target

tests/corpora/test_usfm_file_text.py

@@ -200,7 +200,7 @@ def test_get_rows_include_markers() -> None:
     assert rows[12].text == "Chapter two, verse four."
 
     assert scripture_ref(rows[13]) == ScriptureRef.parse("MAT 2:5", corpus.versification)
-    assert rows[13].text == "Chapter two, verse five \\rq (MAT 3:1)\\rq*."
+    assert rows[13].text == "Chapter two, verse five\\rq (MAT 3:1)\\rq*."
 
     assert scripture_ref(rows[14]) == ScriptureRef.parse("MAT 2:6", corpus.versification)
     assert rows[14].text == 'Chapter two, verse \\w six|strong="12345" \\w*.'
@@ -223,7 +223,7 @@ def test_get_rows_include_markers_all_text() -> None:
     assert len(rows) == 47
 
     assert scripture_ref(rows[2]) == ScriptureRef.parse("MAT 1:0/3:ip", corpus.versification)
-    assert rows[2].text == "An introduction to Matthew with an empty comment\\fe + \\ft This is an endnote.\\fe*"
+    assert rows[2].text == "An introduction to Matthew with an empty comment\\fe + \\ft \\fe*"
 
     assert scripture_ref(rows[8]) == ScriptureRef.parse("MAT 1:1", corpus.versification)
     assert (