Skip to content

Do not reset chapter one when it contains duplicate id tags #365

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

Merged
pmachapman merged 1 commit into from
Dec 14, 2025
Merged

Do not reset chapter one when it contains duplicate id tags #365

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
9 changes: 6 additions & 3 deletions src/SIL.Machine/Corpora/UpdateUsfmParserHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,12 @@ public override void EndUsfm(UsfmParserState state)

public override void StartBook(UsfmParserState state, string marker, string code)
{
_verseRowsRef = state.VerseRef;
UpdateVerseRowsMap();
UpdateVerseRows();
if (_verseRowsRef.BookNum != state.VerseRef.BookNum)
{
_verseRowsRef = state.VerseRef;
UpdateVerseRowsMap();
UpdateVerseRows();
}

CollectReadonlyTokens(state);
_updateBlocks.Push(new UsfmUpdateBlock());
Expand Down
45 changes: 45 additions & 0 deletions tests/SIL.Machine.Tests/Corpora/UpdateUsfmParserHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1306,6 +1306,51 @@ public void GetUsfm_DuplicateVerses()
AssertUsfmEquals(target, resultP);
}

[Test]
public void GetUsfm_IdTags()
{
var rows = new List<UpdateUsfmRow>
{
new UpdateUsfmRow(ScrRef("MAT 1:0/1:s"), "new section header"),
new UpdateUsfmRow(ScrRef("MAT 1:1"), "new verse 1"),
new UpdateUsfmRow(ScrRef("MAT 1:2"), "new verse 2"),
new UpdateUsfmRow(ScrRef("MAT 1:3"), "new verse 3"),
new UpdateUsfmRow(ScrRef("MAT 1:4"), "new verse 4"),
};

string usfm =
@"\id MAT
\s section header
\c 1
\s1 beginning-of-chapter header
\p
\v 1 verse 1
\id
\v 2 verse 2
\id MAT
\v 3 verse 3
\id MRK
\v 4 verse 4
";

string target = UpdateUsfm(rows, usfm, paragraphBehavior: UpdateUsfmMarkerBehavior.Strip);
string resultP =
@"\id MAT
\s new section header
\c 1
\s1 beginning-of-chapter header
\p
\v 1 new verse 1
\id
\v 2 new verse 2
\id MAT
\v 3 new verse 3
\id MRK
\v 4 new verse 4
";
AssertUsfmEquals(target, resultP);
}

[Test]
public void GetUsfm_PreferExisting_AddRemark()
{
Expand Down
Loading