Skip to content

LT-22456: Fix sense number 'after' content for multiple ws #782

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
mark-sil merged 1 commit into from
Mar 24, 2026
Merged

LT-22456: Fix sense number 'after' content for multiple ws #782

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
2 changes: 1 addition & 1 deletion Src/xWorks/CssGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ private static List<StyleRule> GenerateCssForSenses(ConfigurableDictionaryNode c

// Not using SelectClassName here; sense and sensenumber are siblings and the configNode is for the Senses collection.
// Select the base plus the node's unmodified class attribute and append the sensenumber matcher.
var senseNumberSelector = string.Format("{0} .sensenumber", senseContentSelector);
var senseNumberSelector = string.Format("{0} > .sensenumber", senseContentSelector);

senseNumberRule.Value = senseNumberSelector;
if(!String.IsNullOrEmpty(senseOptions.NumberStyle))
Expand Down
8 changes: 4 additions & 4 deletions Src/xWorks/xWorksTests/CssGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2337,7 +2337,7 @@ public void GenerateCssForConfiguration_SenseNumberCharStyleWorks()
PopulateFieldsForTesting(entry);
// SUT
var cssResult = CssGenerator.GenerateCssFromConfiguration(model, m_propertyTable);
VerifyRegex(cssResult, @"\s*\.senses\s*>\s*\.sensecontent\s*\.sensenumber", "sense number style selector was not generated.");
VerifyRegex(cssResult, @"\s*\.senses\s*>\s*\.sensecontent\s*>\s*\.sensenumber", "sense number style selector was not generated.");
VerifyFontInfoInCss(FontColor, FontBGColor, FontName, FontBold, FontItalic, FontSize, cssResult);
}

Expand Down Expand Up @@ -2391,7 +2391,7 @@ public void GenerateCssForConfiguration_ReversalSenseNumberWorks()
// SUT
var cssResult = CssGenerator.GenerateCssFromConfiguration(model, m_propertyTable);
VerifyRegex(cssResult, @"^.gloss\s*{\s*font-family", "Gloss with style was not generated from reversal sense");
VerifyRegex(cssResult, @"^\.refdsenses\s*>\s*\.sensecontent\s*\.sensenumber\s*{.*font-style\s*:\s*italic;.*}", "Sense Number missing");
VerifyRegex(cssResult, @"^\.refdsenses\s*>\s*\.sensecontent\s*>\s*\.sensenumber\s*{.*font-style\s*:\s*italic;.*}", "Sense Number missing");
}

[Test]
Expand All @@ -2414,8 +2414,8 @@ public void GenerateCssForConfiguration_SenseNumberBeforeAndAfterWork()
PopulateFieldsForTesting(entry);
// SUT
var cssResult = CssGenerator.GenerateCssFromConfiguration(model, m_propertyTable);
VerifyRegex(cssResult, @"\s*\.senses\s*>\s*\.sensecontent\s*\.sensenumber:before{.*content:'\['.*}", "Before content not applied to the sense number selector.");
VerifyRegex(cssResult, @"\s*\.senses\s*>\s*\.sensecontent\s*\.sensenumber:after{.*content:'\]'.*}", "After content not applied to the sense number selector.");
VerifyRegex(cssResult, @"\s*\.senses\s*>\s*\.sensecontent\s*>\s*\.sensenumber:before{.*content:'\['.*}", "Before content not applied to the sense number selector.");
VerifyRegex(cssResult, @"\s*\.senses\s*>\s*\.sensecontent\s*>\s*\.sensenumber:after{.*content:'\]'.*}", "After content not applied to the sense number selector.");
}

[Test]
Expand Down
Loading