diff --git a/src/SIL.Machine/Corpora/ScriptureRefUsfmParserHandlerBase.cs b/src/SIL.Machine/Corpora/ScriptureRefUsfmParserHandlerBase.cs index e07cce42..f6ec4389 100644 --- a/src/SIL.Machine/Corpora/ScriptureRefUsfmParserHandlerBase.cs +++ b/src/SIL.Machine/Corpora/ScriptureRefUsfmParserHandlerBase.cs @@ -16,8 +16,6 @@ public enum ScriptureTextType public abstract class ScriptureRefUsfmParserHandlerBase : UsfmParserHandlerBase { - private static readonly HashSet UntranslatedParagraphTag = new HashSet { "r", "rem", }; - private VerseRef _curVerseRef; private readonly Stack _curElements; private readonly Stack _curTextType; @@ -366,12 +364,7 @@ private void CheckConvertVerseParaToNonVerse(UsfmParserState state) public bool InEmbedded(string marker) { - return _inEmbedded || IsEmbeddedPart(marker); - } - - public static bool IsUntranslatedParagraph(string tag) - { - return !(tag is null) && UntranslatedParagraphTag.Contains(tag); + return _inEmbedded || IsEmbeddedCharacter(marker); } private static bool IsNoteText(string marker) diff --git a/src/SIL.Machine/Corpora/UpdateUsfmParserHandler.cs b/src/SIL.Machine/Corpora/UpdateUsfmParserHandler.cs index 7f26d079..4596a686 100644 --- a/src/SIL.Machine/Corpora/UpdateUsfmParserHandler.cs +++ b/src/SIL.Machine/Corpora/UpdateUsfmParserHandler.cs @@ -23,6 +23,7 @@ public enum UpdateUsfmIntraVerseMarkerBehavior */ public class UpdateUsfmParserHandler : ScriptureRefUsfmParserHandlerBase { + private static readonly HashSet UntranslatedParagraphTag = new HashSet { "r", "rem", }; private readonly IReadOnlyList<(IReadOnlyList, string)> _rows; private readonly List _tokens; private readonly List _newTokens; @@ -441,5 +442,10 @@ private void PopNewTokens() { _replace.Pop(); } + + public static bool IsUntranslatedParagraph(string tag) + { + return !(tag is null) && UntranslatedParagraphTag.Contains(tag); + } } } diff --git a/src/SIL.Machine/Corpora/UsfmParser.cs b/src/SIL.Machine/Corpora/UsfmParser.cs index 2bab986f..8028b2fa 100644 --- a/src/SIL.Machine/Corpora/UsfmParser.cs +++ b/src/SIL.Machine/Corpora/UsfmParser.cs @@ -508,7 +508,6 @@ public bool ProcessToken() token.Type == UsfmTokenType.Unknown || invalidMarker, token.Attributes ); - break; case UsfmTokenType.Note: // Look for category