Skip to content

Port 'Fix verses appearing in remarks when missing a paragraph marker' #342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pmachapman wants to merge 1 commit into
base: main
Choose a base branch
from
+62 −0
Open

Port 'Fix verses appearing in remarks when missing a paragraph marker' #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions machine/corpora/update_usfm_parser_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,10 @@ def get_usfm(self, stylesheet: Union[str, UsfmStylesheet] = "usfm.sty") -> str:
if index < len(tokens) and tokens[index].type == UsfmTokenType.TEXT:
index += 1

# If the next token is a verse, add \nb to prevent the verse appearing in the remark
if tokens[index].type == UsfmTokenType.VERSE:
tokens.insert(index, UsfmToken(UsfmTokenType.PARAGRAPH, "nb"))

tokens[index:index] = remark_tokens
return tokenizer.detokenize(tokens)

Expand Down
58 changes: 58 additions & 0 deletions tests/corpora/test_update_usfm_parser_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1386,11 +1386,13 @@ def test_pass_remark():
\ide UTF-8
\rem Existing remark
\c 1
\p
\v 1 Some text
\v 2
\v 3 Other text
\c 2
\rem Existing remark
\p
\v 1 More text
\c 3
"""
Expand All @@ -1407,12 +1409,66 @@ def test_pass_remark():
\rem New remark 0
\c 1
\rem New remark 1
\p
\v 1 Some text
\v 2 Update 2
\v 3 Other text
\c 2
\rem Existing remark
\rem New remark 2
\p
\v 1 More text
\c 3
\rem New remark 3
"""

assert_usfm_equals(target, result)


def test_no_body_remark():
rows = [
UpdateUsfmRow(
scr_ref("MAT 1:1"),
"Update 1",
),
UpdateUsfmRow(
scr_ref("MAT 1:2"),
"Update 2",
),
]
usfm = r"""\id MAT - Test
\ide UTF-8
\rem Existing remark
\c 1
\v 1 Some text
\v 2
\v 3 Other text
\c 2
\rem Existing remark
\v 1 More text
\c 3
"""

target = update_usfm(
rows,
usfm,
text_behavior=UpdateUsfmTextBehavior.PREFER_EXISTING,
remarks=[(0, "New remark 0"), (1, "New remark 1"), (2, "New remark 2"), (3, "New remark 3")],
)
result = r"""\id MAT - Test
\ide UTF-8
\rem Existing remark
\rem New remark 0
\c 1
\rem New remark 1
\nb
\v 1 Some text
\v 2 Update 2
\v 3 Other text
\c 2
\rem Existing remark
\rem New remark 2
\nb
\v 1 More text
\c 3
\rem New remark 3
Expand Down Expand Up @@ -1471,6 +1527,7 @@ def test_pass_multiple_remarks_same_chapter() -> None:
\ide UTF-8
\rem Existing remark
\c 1
\q1
\v 1 Some text
\v 2
\v 3 Other text
Expand All @@ -1490,6 +1547,7 @@ def test_pass_multiple_remarks_same_chapter() -> None:
\c 1
\rem New remark 1.1
\rem New remark 1.2
\q1
\v 1 Some text
\v 2 Update 2
\v 3 Other text
Expand Down