Skip to content

Commit defe7dc

Browse files
author
Ben King
committed
Change update_usfm_parser_handler.py to match main branch
1 parent a594d75 commit defe7dc

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

machine/corpora/update_usfm_parser_handler.py

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
from enum import Enum, auto
22
from typing import Iterable, List, Optional, Sequence, Tuple, Union
33

4-
from ..scripture.verse_ref import VerseRef
5-
from .scripture_embed import is_embed_part_style
64
from .scripture_ref import ScriptureRef
75
from .scripture_ref_usfm_parser_handler import ScriptureRefUsfmParserHandler, ScriptureTextType
86
from .usfm_parser_state import UsfmParserState
@@ -345,12 +343,9 @@ def _skip_updatable_tokens(self, state: UsfmParserState) -> None:
345343
self._token_index += 1
346344
self._token_index = state.index + 1 + state.special_token_count
347345

348-
def _replace_with_new_tokens(self, state: UsfmParserState, closed: bool = True) -> bool:
349-
marker: Optional[str] = state.token if state.token is None else state.token.marker
350-
in_embed: bool = self._is_in_embed(marker)
351-
352-
in_nested_embed: bool = self._is_in_nested_embed(marker)
353-
is_style_tag: bool = marker is not None and not is_embed_part_style(marker)
346+
def _replace_with_new_tokens(self, state: UsfmParserState) -> bool:
347+
if self._current_text_type == ScriptureTextType.EMBED:
348+
return False
354349

355350
existing_text = any(
356351
t.type == UsfmTokenType.TEXT and t.text

tests/corpora/test_update_usfm_parser_handler.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,6 @@ def test_paragraph_in_verse():
208208
usfm = r"""\id MAT - Test
209209
\c 1
210210
\p paragraph not in a verse
211-
\p paragraph not in a verse
212211
\v 1 verse 1 \p inner verse paragraph
213212
\s1 Section Header
214213
\v 2 Verse 2 \p inner verse paragraph
@@ -219,7 +218,6 @@ def test_paragraph_in_verse():
219218
result = r"""\id MAT - Test
220219
\c 1
221220
\p paragraph not in a verse
222-
\p paragraph not in a verse
223221
\v 1 Update 1
224222
\s1 Section Header
225223
\v 2 Verse 2 inner verse paragraph
@@ -236,7 +234,7 @@ def test_paragraph_in_verse():
236234

237235
result_strip = r"""\id MAT
238236
\c 1
239-
\p
237+
\p
240238
\v 1 Update 1
241239
\s1
242240
\v 2

0 commit comments

Comments
 (0)