Skip to content

Fix LT-22153: Handle merging flextext #385

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
jtmaxwell3 merged 2 commits into from
Jul 1, 2025
Merged

Fix LT-22153: Handle merging flextext #385

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4eb283e
Fix LT-22153: Handle merging flextext
jtmaxwell3 Jul 1, 2025
5073619
Make unit tests work
jtmaxwell3 Jul 1, 2025
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
19 changes: 10 additions & 9 deletions Src/LexText/Interlinear/BIRDInterlinearImporter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,12 +710,6 @@ private static void AddWordToSegment(ISegment newSegment, Word word)
//use the items under the word to determine what kind of thing to add to the segment
var cache = newSegment.Cache;
IAnalysis analysis = CreateWordAnalysisStack(cache, word);
if (analysis != null && word.morphemes?.analysisStatus == analysisStatusTypes.guess)
{
// Ignore morphological analysis if it was only a guess.
analysis = analysis.Wordform;
}

// Add to segment
if (analysis != null)
{
Expand Down Expand Up @@ -941,19 +935,26 @@ private static void UpgradeToWordGloss(Word word, ref IAnalysis analysis)
// else, reuse the same analysisTree for setting a gloss alternative

analysisTree.Gloss.Form.set_String(wsNewGloss, wordGlossItem.Value);
// Make sure this analysis is marked as user-approved (green check mark)
cache.LangProject.DefaultUserAgent.SetEvaluation(analysisTree.WfiAnalysis, Opinions.approves);
if (word.morphemes?.analysisStatus != analysisStatusTypes.guess)
{
// Make sure this analysis is marked as user-approved (green check mark)
cache.LangProject.DefaultUserAgent.SetEvaluation(analysisTree.WfiAnalysis, Opinions.approves);
}
// Create a morpheme form that matches the wordform.
var morphemeBundle = cache.ServiceLocator.GetInstance<IWfiMorphBundleFactory>().Create();
var wordItem = word.Items.Select(i => i).First(i => i.type == "txt");
int wsWord = GetWsEngine(wsFact, wordItem.lang).Handle;
analysisTree.WfiAnalysis.MorphBundlesOS.Add(morphemeBundle);
morphemeBundle.Form.set_String(wsWord, wordItem.Value);

analysis = analysisTree.Gloss;
}
}
}
if (analysis != null && word.morphemes?.analysisStatus == analysisStatusTypes.guess)
{
// Ignore gloss if morphological analysis was only a guess.
analysis = analysis.Wordform;
}
}

/// <summary>
Expand Down
Loading