Make inline with understood reviews

sillsdev · Jun 19, 2024 · 55fad88 · 55fad88
1 parent d94a768
commit 55fad88
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/src/SIL.Machine/Corpora/IUsfmParserHandler.cs b/src/SIL.Machine/Corpora/IUsfmParserHandler.cs
@@ -31,7 +31,7 @@ public interface IUsfmParserHandler
         /// End of a book element, not the end of the entire book.
         /// Book element contains the description as text
         /// </summary>
-        void EndBook(UsfmParserState state);
+        void EndBook(UsfmParserState state, string marker);
 
         /// <summary>
         /// Chapter element

diff --git a/src/SIL.Machine/Corpora/ScriptureRefUsfmParserHandlerBase.cs b/src/SIL.Machine/Corpora/ScriptureRefUsfmParserHandlerBase.cs
@@ -35,7 +35,6 @@ protected ScriptureRefUsfmParserHandlerBase()
         public override void EndUsfm(UsfmParserState state)
         {
             EndVerseText(state);
-            EndBook(state);
         }
 
         public override void Chapter(

diff --git a/src/SIL.Machine/Corpora/UsfmParserHandlerBase.cs b/src/SIL.Machine/Corpora/UsfmParserHandlerBase.cs
@@ -12,7 +12,7 @@ public virtual void GotMarker(UsfmParserState state, string marker) { }
 
         public virtual void StartBook(UsfmParserState state, string marker, string code) { }
 
-        public virtual void EndBook(UsfmParserState state) { }
+        public virtual void EndBook(UsfmParserState state, string marker) { }
 
         public virtual void Chapter(
             UsfmParserState state,

diff --git a/src/SIL.Machine/Corpora/UsfmTextUpdater.cs b/src/SIL.Machine/Corpora/UsfmTextUpdater.cs
@@ -41,6 +41,7 @@ public UsfmTextUpdater(
         public override void EndUsfm(UsfmParserState state)
         {
             CollectTokens(state);
+            InsertRemainingRows();
             base.EndUsfm(state);
         }
 
@@ -55,12 +56,11 @@ public override void StartBook(UsfmParserState state, string marker, string code
             base.StartBook(state, marker, code);
         }
 
-        public override void EndBook(UsfmParserState state)
+        public override void EndBook(UsfmParserState state, string marker)
         {
             PopNewTokens();
 
-            InsertRemainingRows();
-            base.EndBook(state);
+            base.EndBook(state, marker);
         }
 
         public override void StartPara(

diff --git a/tests/SIL.Machine.Tests/Corpora/UsfmTokenizerTests.cs b/tests/SIL.Machine.Tests/Corpora/UsfmTokenizerTests.cs
@@ -11,7 +11,7 @@ public void Tokenize()
         string usfm = ReadUsfm();
         var tokenizer = new UsfmTokenizer();
         IReadOnlyList<UsfmToken> tokens = tokenizer.Tokenize(usfm);
-        Assert.That(tokens, Has.Count.EqualTo(238));
+        Assert.That(tokens, Has.Count.EqualTo(239));
 
         Assert.That(tokens[0].Type, Is.EqualTo(UsfmTokenType.Book));
         Assert.That(tokens[0].Marker, Is.EqualTo("id"));