Skip to content

Fix LT-22303: Import flextext adds a paragraph marker #601

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
Jan 9, 2026
Merged

Fix LT-22303: Import flextext adds a paragraph marker #601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d23e48
Fix LT-22303: Import flextext adds a paragraph marker
jtmaxwell3 Jan 1, 2026
0aeb3e9
Use ParagraphParser.EndsWithEOS
jtmaxwell3 Jan 9, 2026
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
2 changes: 1 addition & 1 deletion Build/mkall.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@
<ChorusNugetVersion>6.0.0-beta0063</ChorusNugetVersion>
<PalasoNugetVersion>17.0.0-beta0089</PalasoNugetVersion>
<ParatextNugetVersion>9.4.0.1-beta</ParatextNugetVersion>
<LcmNugetVersion>11.0.0-beta0148</LcmNugetVersion>
<LcmNugetVersion>11.0.0-beta0149</LcmNugetVersion>
<IcuNugetVersion>70.1.123</IcuNugetVersion>
<HermitCrabNugetVersion>3.7.4</HermitCrabNugetVersion>
<IPCFrameworkVersion>1.1.1-beta0001</IPCFrameworkVersion>
Expand Down
18 changes: 9 additions & 9 deletions Build/nuget-common/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@
<package id="SIL.Core" version="8.1.0-beta0035" targetFramework="net461" />
<package id="SIL.DesktopAnalytics" version="4.0.0" targetFramework="net461" />
<package id="SIL.FLExBridge.IPCFramework" version="1.1.1-beta0001" targetFramework="net461" />
<package id="SIL.LCModel.Build.Tasks" version="11.0.0-beta0148" targetFramework="net462" />
<package id="SIL.LCModel.Core.Tests" version="11.0.0-beta0148" targetFramework="net462" />
<package id="SIL.LCModel.Core" version="11.0.0-beta0148" targetFramework="net462" />
<package id="SIL.LCModel.FixData" version="11.0.0-beta0148" targetFramework="net462" />
<package id="SIL.LCModel.Tests" version="11.0.0-beta0148" targetFramework="net462" />
<package id="SIL.LCModel.Tools" version="11.0.0-beta0148" targetFramework="net462" />
<package id="SIL.LCModel.Utils.Tests" version="11.0.0-beta0148" targetFramework="net462" />
<package id="SIL.LCModel.Utils" version="11.0.0-beta0148" targetFramework="net462" />
<package id="SIL.LCModel" version="11.0.0-beta0148" targetFramework="net462" />
<package id="SIL.LCModel.Build.Tasks" version="11.0.0-beta0149" targetFramework="net462" />
<package id="SIL.LCModel.Core.Tests" version="11.0.0-beta0149" targetFramework="net462" />
<package id="SIL.LCModel.Core" version="11.0.0-beta0149" targetFramework="net462" />
<package id="SIL.LCModel.FixData" version="11.0.0-beta0149" targetFramework="net462" />
<package id="SIL.LCModel.Tests" version="11.0.0-beta0149" targetFramework="net462" />
<package id="SIL.LCModel.Tools" version="11.0.0-beta0149" targetFramework="net462" />
<package id="SIL.LCModel.Utils.Tests" version="11.0.0-beta0149" targetFramework="net462" />
<package id="SIL.LCModel.Utils" version="11.0.0-beta0149" targetFramework="net462" />
<package id="SIL.LCModel" version="11.0.0-beta0149" targetFramework="net462" />
<package id="SIL.Lexicon" version="17.0.0-beta0089" targetFramework="net462" />
<package id="SIL.libpalaso.l10ns" version="6.0.0" targetFramework="net461" />
<package id="SIL.Lift" version="17.0.0-beta0089" targetFramework="net462" />
Expand Down
5 changes: 3 additions & 2 deletions Src/LexText/Interlinear/BIRDInterlinearImporter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,8 +332,9 @@ private static void UpdateParagraphTextForPhrase(IStTxtPara newTextPara, ref int
}
offset += phraseText.Length;
var oldText = (bldr.Text ?? "").Trim();
if (oldText.Length > 0 && !TsStringUtils.IsEndOfSentenceChar(oldText[oldText.Length - 1],
Icu.Character.UCharCategory.OTHER_PUNCTUATION))
LcmCache cache = newTextPara.Cache;
ITsString tsString = TsStringUtils.MakeString(oldText, cache.DefaultVernWs);
if (oldText.Length > 0 && !ParagraphParser.EndsWithEOS(tsString, cache))
{
// 'segment' does not end with recognizable EOS character. Add our special one.
bldr.Replace(bldr.Length, bldr.Length, "\x00A7", null);
Expand Down
Loading