Skip to content

Commit

Permalink
Standardize (ha!) options enums
Browse files Browse the repository at this point in the history
  • Loading branch information
@JimBobSquarePants
JimBobSquarePants committed Oct 15, 2022
1 parent a0ad57a commit f704bbd
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/KerningMode.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public enum KerningMode
/// <summary>
/// Specifies that kerning is applied.
/// </summary>
Normal,
Standard,

/// <summary>
/// Specifies that kerning is not applied.
Expand Down
4 changes: 2 additions & 2 deletions src/SixLabors.Fonts/WordBreaking.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public enum WordBreaking
/// <summary>
/// Use the default line break rule.
/// </summary>
Normal,
Standard,

/// <summary>
/// To prevent overflow, word breaks should be inserted between any two
Expand All @@ -22,7 +22,7 @@ public enum WordBreaking

/// <summary>
/// Word breaks should not be used for Chinese/Japanese/Korean (CJK) text.
/// Non-CJK text behavior is the same as for <see cref="Normal"/>
/// Non-CJK text behavior is the same as for <see cref="Standard"/>
/// </summary>
KeepAll
}
Expand Down
8 changes: 4 additions & 4 deletions tests/SixLabors.Fonts.Tests/GlyphTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,14 +176,14 @@ public void RenderWoffGlyphs_IsEqualToTtfGlyphs(bool applyKerning, bool applyHin
var rendererTtf = new ColorGlyphRenderer();
TextRenderer.RenderTextTo(rendererTtf, testStr, new TextOptions(fontTtf)
{
KerningMode = applyKerning ? KerningMode.Normal : KerningMode.None,
KerningMode = applyKerning ? KerningMode.Standard : KerningMode.None,
HintingMode = applyHinting ? HintingMode.Standard : HintingMode.None,
ColorFontSupport = ColorFontSupport.MicrosoftColrFormat
});
var rendererWoff = new ColorGlyphRenderer();
TextRenderer.RenderTextTo(rendererWoff, testStr, new TextOptions(fontWoff)
{
KerningMode = applyKerning ? KerningMode.Normal : KerningMode.None,
KerningMode = applyKerning ? KerningMode.Standard : KerningMode.None,
HintingMode = applyHinting ? HintingMode.Standard : HintingMode.None,
ColorFontSupport = ColorFontSupport.MicrosoftColrFormat
});
Expand Down Expand Up @@ -235,14 +235,14 @@ public void RenderWoff2Glyphs_IsEqualToTtfGlyphs(bool applyKerning, bool applyHi
var rendererTtf = new ColorGlyphRenderer();
TextRenderer.RenderTextTo(rendererTtf, testStr, new TextOptions(fontTtf)
{
KerningMode = applyKerning ? KerningMode.Normal : KerningMode.None,
KerningMode = applyKerning ? KerningMode.Standard : KerningMode.None,
HintingMode = applyHinting ? HintingMode.Standard : HintingMode.None,
ColorFontSupport = ColorFontSupport.MicrosoftColrFormat
});
var rendererWoff2 = new ColorGlyphRenderer();
TextRenderer.RenderTextTo(rendererWoff2, testStr, new TextOptions(fontWoff2)
{
KerningMode = applyKerning ? KerningMode.Normal : KerningMode.None,
KerningMode = applyKerning ? KerningMode.Standard : KerningMode.None,
HintingMode = applyHinting ? HintingMode.Standard : HintingMode.None,
ColorFontSupport = ColorFontSupport.MicrosoftColrFormat
});
Expand Down
12 changes: 6 additions & 6 deletions tests/SixLabors.Fonts.Tests/TextLayoutTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,10 +251,10 @@ public void MeasureTextWordWrappingVerticalRightLeft(string text, float height,

#if OS_WINDOWS
[Theory]
[InlineData("This is a long and Honorificabilitudinitatibus califragilisticexpialidocious Taumatawhakatangihangakoauauotamateaturipukakapikimaungahoronukupokaiwhenuakitanatahu グレートブリテンおよび北アイルランド連合王国という言葉は本当に長い言葉", LayoutMode.HorizontalTopBottom, WordBreaking.Normal, 134, 871)]
[InlineData("This is a long and Honorificabilitudinitatibus califragilisticexpialidocious Taumatawhakatangihangakoauauotamateaturipukakapikimaungahoronukupokaiwhenuakitanatahu グレートブリテンおよび北アイルランド連合王国という言葉は本当に長い言葉", LayoutMode.HorizontalTopBottom, WordBreaking.Standard, 134, 871)]
[InlineData("This is a long and Honorificabilitudinitatibus califragilisticexpialidocious Taumatawhakatangihangakoauauotamateaturipukakapikimaungahoronukupokaiwhenuakitanatahu グレートブリテンおよび北アイルランド連合王国という言葉は本当に長い言葉", LayoutMode.HorizontalTopBottom, WordBreaking.BreakAll, 160, 400)]
[InlineData("This is a long and Honorificabilitudinitatibus califragilisticexpialidocious グレートブリテンおよび北アイルランド連合王国という言葉は本当に長い言葉", LayoutMode.HorizontalTopBottom, WordBreaking.KeepAll, 80, 700)]
[InlineData("This is a long and Honorificabilitudinitatibus califragilisticexpialidocious Taumatawhakatangihangakoauauotamateaturipukakapikimaungahoronukupokaiwhenuakitanatahu グレートブリテンおよび北アイルランド連合王国という言葉は本当に長い言葉", LayoutMode.HorizontalBottomTop, WordBreaking.Normal, 134, 871)]
[InlineData("This is a long and Honorificabilitudinitatibus califragilisticexpialidocious Taumatawhakatangihangakoauauotamateaturipukakapikimaungahoronukupokaiwhenuakitanatahu グレートブリテンおよび北アイルランド連合王国という言葉は本当に長い言葉", LayoutMode.HorizontalBottomTop, WordBreaking.Standard, 134, 871)]
[InlineData("This is a long and Honorificabilitudinitatibus califragilisticexpialidocious Taumatawhakatangihangakoauauotamateaturipukakapikimaungahoronukupokaiwhenuakitanatahu グレートブリテンおよび北アイルランド連合王国という言葉は本当に長い言葉", LayoutMode.HorizontalBottomTop, WordBreaking.BreakAll, 160, 400)]
[InlineData("This is a long and Honorificabilitudinitatibus califragilisticexpialidocious グレートブリテンおよび北アイルランド連合王国という言葉は本当に長い言葉", LayoutMode.HorizontalBottomTop, WordBreaking.KeepAll, 80, 700)]
public void MeasureTextWordBreak(string text, LayoutMode layoutMode, WordBreaking wordBreaking, float height, float width)
Expand Down Expand Up @@ -294,7 +294,7 @@ public void MeasureTextWithKerning(string text, float height, float width, bool
new TextOptions(new Font(font, 1))
{
Dpi = font.FontMetrics.ScaleFactor,
KerningMode = applyKerning ? KerningMode.Normal : KerningMode.None,
KerningMode = applyKerning ? KerningMode.Standard : KerningMode.None,
});

Assert.Equal(height, size.Height, 4);
Expand Down Expand Up @@ -759,7 +759,7 @@ public void TrueTypeHinting_CanHintSmallOpenSans(char c, FontRectangle expected)
{
TextOptions options = new(OpenSansTTF)
{
KerningMode = KerningMode.Normal,
KerningMode = KerningMode.Standard,
HintingMode = HintingMode.Standard
};

Expand All @@ -768,7 +768,7 @@ public void TrueTypeHinting_CanHintSmallOpenSans(char c, FontRectangle expected)

options = new(OpenSansWoff)
{
KerningMode = KerningMode.Normal,
KerningMode = KerningMode.Standard,
HintingMode = HintingMode.Standard
};

Expand Down Expand Up @@ -885,7 +885,7 @@ public void TrueTypeHinting_CanHintSmallSegoeUi(char c, FontRectangle expected)
{
TextOptions options = new(SegoeUi)
{
KerningMode = KerningMode.Normal,
KerningMode = KerningMode.Standard,
HintingMode = HintingMode.Standard
};

Expand Down
4 changes: 2 additions & 2 deletions tests/SixLabors.Fonts.Tests/TextOptionsTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ public void GetGlyphFromFirstAvailableInstance(char character, string instance)
[Fact]
public void DefaultTextOptionsApplyKerning()
{
const KerningMode expected = KerningMode.Normal;
const KerningMode expected = KerningMode.Standard;
Assert.Equal(expected, this.newTextOptions.KerningMode);
Assert.Equal(expected, this.clonedTextOptions.KerningMode);
}
Expand Down Expand Up @@ -357,7 +357,7 @@ public void CloneIsDeep()
private static void VerifyPropertyDefault(TextOptions options)
{
Assert.Equal(4, options.TabWidth);
Assert.Equal(KerningMode.Normal, options.KerningMode);
Assert.Equal(KerningMode.Standard, options.KerningMode);
Assert.Equal(-1, options.WrappingLength);
Assert.Equal(HorizontalAlignment.Left, options.HorizontalAlignment);
Assert.Equal(VerticalAlignment.Top, options.VerticalAlignment);
Expand Down

0 comments on commit f704bbd

Please sign in to comment.