Merge pull request #521 from SixLabors/js/featuretags

JimBobSquarePants · web-flow · commit 739606071151 · 2026-04-05T21:36:12.000+10:00
Rename FeatureTags to match standard
diff --git a/src/SixLabors.Fonts/GlyphPositioningCollection.cs b/src/SixLabors.Fonts/GlyphPositioningCollection.cs
@@ -118,9 +118,9 @@ public bool TryGetGlyphMetricsAtOffset(
         isVerticalSubstitution = false;
         isDecomposed = false;
 
-        Tag vert = FeatureTags.VerticalAlternates;
-        Tag vrt2 = FeatureTags.VerticalAlternatesAndRotation;
-        Tag vrtr = FeatureTags.VerticalAlternatesForRotation;
+        Tag vert = KnownFeatureTags.VerticalAlternates;
+        Tag vrt2 = KnownFeatureTags.VerticalAlternatesAndRotation;
+        Tag vrtr = KnownFeatureTags.VerticalAlternatesForRotation;
 
         for (int i = startIndex; i < this.glyphs.Count; i++)
         {
@@ -171,9 +171,9 @@ public bool TryUpdate(Font font, GlyphSubstitutionCollection collection)
         bool hasFallBacks = false;
         List<int> orphans = [];
 
-        Tag vert = FeatureTags.VerticalAlternates;
-        Tag vrt2 = FeatureTags.VerticalAlternatesAndRotation;
-        Tag vrtr = FeatureTags.VerticalAlternatesForRotation;
+        Tag vert = KnownFeatureTags.VerticalAlternates;
+        Tag vrt2 = KnownFeatureTags.VerticalAlternatesAndRotation;
+        Tag vrtr = KnownFeatureTags.VerticalAlternatesForRotation;
 
         for (int i = 0; i < this.glyphs.Count; i++)
         {
@@ -268,9 +268,9 @@ public bool TryAdd(Font font, GlyphSubstitutionCollection collection)
         LayoutMode layoutMode = this.TextOptions.LayoutMode;
         ColorFontSupport colorFontSupport = this.TextOptions.ColorFontSupport;
 
-        Tag vert = FeatureTags.VerticalAlternates;
-        Tag vrt2 = FeatureTags.VerticalAlternatesAndRotation;
-        Tag vrtr = FeatureTags.VerticalAlternatesForRotation;
+        Tag vert = KnownFeatureTags.VerticalAlternates;
+        Tag vrt2 = KnownFeatureTags.VerticalAlternatesAndRotation;
+        Tag vrtr = KnownFeatureTags.VerticalAlternatesForRotation;
 
         for (int i = 0; i < collection.Count; i++)
         {
@@ -358,9 +358,9 @@ public void UpdatePosition(FontMetrics fontMetrics, int index)
     public void Advance(FontMetrics fontMetrics, int index, ushort glyphId, short dx, short dy)
     {
         LayoutMode layoutMode = this.TextOptions.LayoutMode;
-        Tag vert = FeatureTags.VerticalAlternates;
-        Tag vrt2 = FeatureTags.VerticalAlternatesAndRotation;
-        Tag vrtr = FeatureTags.VerticalAlternatesForRotation;
+        Tag vert = KnownFeatureTags.VerticalAlternates;
+        Tag vrt2 = KnownFeatureTags.VerticalAlternatesAndRotation;
+        Tag vrtr = KnownFeatureTags.VerticalAlternatesForRotation;
 
         GlyphPositioningData glyph = this.glyphs[index];
         GlyphMetrics m = glyph.Metrics;
diff --git a/src/SixLabors.Fonts/Tables/AdvancedTypographic/KnownFeatureTags.cs b/src/SixLabors.Fonts/Tables/AdvancedTypographic/KnownFeatureTags.cs
@@ -7,7 +7,7 @@ namespace SixLabors.Fonts.Tables.AdvancedTypographic;
 /// Provides enumeration for the different font features.
 /// <see href="https://docs.microsoft.com/en-us/typography/opentype/spec/featuretags"/>
 /// </summary>
-public enum FeatureTags : uint
+public enum KnownFeatureTags : uint
 {
     /// <summary>
     /// Access All Alternates. Shortcode: aalt.
diff --git a/src/SixLabors.Fonts/Tables/AdvancedTypographic/Shapers/HangulShaper.cs b/src/SixLabors.Fonts/Tables/AdvancedTypographic/Shapers/HangulShaper.cs
@@ -309,7 +309,7 @@ private int DecomposeGlyph(GlyphSubstitutionCollection collection, GlyphShapingD
             ii[1] = vjmo;
             ii[0] = ljmo;
 
-            collection.Replace(index, ii, FeatureTags.GlyphCompositionDecomposition);
+            collection.Replace(index, ii, KnownFeatureTags.GlyphCompositionDecomposition);
             collection.EnableShapingFeature(index, LjmoTag);
             collection.EnableShapingFeature(index + 1, VjmoTag);
             return index + 1;
@@ -320,7 +320,7 @@ private int DecomposeGlyph(GlyphSubstitutionCollection collection, GlyphShapingD
         iii[1] = vjmo;
         iii[0] = ljmo;
 
-        collection.Replace(index, iii, FeatureTags.GlyphCompositionDecomposition);
+        collection.Replace(index, iii, KnownFeatureTags.GlyphCompositionDecomposition);
         collection.EnableShapingFeature(index, LjmoTag);
         collection.EnableShapingFeature(index + 1, VjmoTag);
         collection.EnableShapingFeature(index + 2, TjmoTag);
@@ -393,7 +393,7 @@ private int ComposeGlyph(GlyphSubstitutionCollection collection, int index, int
             {
                 int del = prevType == V ? 3 : 2;
                 int idx = index - del + 1;
-                collection.Replace(idx, del - 1, id, FeatureTags.GlyphCompositionDecomposition);
+                collection.Replace(idx, del - 1, id, KnownFeatureTags.GlyphCompositionDecomposition);
                 collection[idx].CodePoint = s;
                 return idx;
             }
@@ -496,7 +496,7 @@ private int InsertDottedCircle(GlyphSubstitutionCollection collection, GlyphShap
                 glyphs[0] = id;
             }
 
-            collection.Replace(index, glyphs, FeatureTags.GlyphCompositionDecomposition);
+            collection.Replace(index, glyphs, KnownFeatureTags.GlyphCompositionDecomposition);
             return index + 1;
         }
 
diff --git a/src/SixLabors.Fonts/Tables/AdvancedTypographic/Shapers/HebrewShaper.cs b/src/SixLabors.Fonts/Tables/AdvancedTypographic/Shapers/HebrewShaper.cs
@@ -147,7 +147,7 @@ private static void ComposeHebrewForms(GlyphSubstitutionCollection collection, F
             if (composed != 0 && fontMetrics.TryGetGlyphId(new CodePoint(composed), out ushort composedGlyphId))
             {
                 // Replace the two glyphs with the composed form.
-                collection.Replace(i - 1, 2, composedGlyphId, FeatureTags.GlyphCompositionDecomposition);
+                collection.Replace(i - 1, 2, composedGlyphId, KnownFeatureTags.GlyphCompositionDecomposition);
                 end--;
                 i--;
             }
diff --git a/src/SixLabors.Fonts/Tables/AdvancedTypographic/Shapers/IndicShaper.cs b/src/SixLabors.Fonts/Tables/AdvancedTypographic/Shapers/IndicShaper.cs
@@ -193,7 +193,7 @@ protected override void AssignFeatures(IGlyphShapingCollection collection, int i
 
                 if (shouldDecompose)
                 {
-                    substitutionCollection.Replace(i, ids, FeatureTags.GlyphCompositionDecomposition);
+                    substitutionCollection.Replace(i, ids, KnownFeatureTags.GlyphCompositionDecomposition);
                     for (int j = 0; j < decompositions.Length; j++)
                     {
                         substitutionCollection[i + j].CodePoint = new(decompositions[j]);
@@ -382,7 +382,7 @@ private void InitialReorder(IGlyphShapingCollection collection, int index, int c
                         glyphs[0] = circleId;
                         glyphs[1] = current.GlyphId;
 
-                        substitutionCollection.Replace(i, glyphs, FeatureTags.GlyphCompositionDecomposition);
+                        substitutionCollection.Replace(i, glyphs, KnownFeatureTags.GlyphCompositionDecomposition);
 
                         // The dotted circle is now at position i (inherits original shaping info).
                         // Update it to be a dotted circle base.
diff --git a/src/SixLabors.Fonts/Tables/AdvancedTypographic/Shapers/MyanmarShaper.cs b/src/SixLabors.Fonts/Tables/AdvancedTypographic/Shapers/MyanmarShaper.cs
@@ -220,7 +220,7 @@ private void InitialReorder(IGlyphShapingCollection collection, int index, int c
                         glyphs[0] = current.GlyphId;
                         glyphs[1] = circleId;
 
-                        substitutionCollection.Replace(i, glyphs, FeatureTags.GlyphCompositionDecomposition);
+                        substitutionCollection.Replace(i, glyphs, KnownFeatureTags.GlyphCompositionDecomposition);
 
                         // Update shaping info for newly inserted data.
                         GlyphShapingData dotted = substitutionCollection[i + 1];
diff --git a/src/SixLabors.Fonts/Tables/AdvancedTypographic/Shapers/ThaiShaper.cs b/src/SixLabors.Fonts/Tables/AdvancedTypographic/Shapers/ThaiShaper.cs
@@ -241,7 +241,7 @@ private static int PreprocessSaraAm(GlyphSubstitutionCollection collection, Font
 
             // Decompose SARA AM into [NIKHAHIT, SARA AA].
             // Replace puts NIKHAHIT at index i, SARA AA at index i+1.
-            collection.Replace(i, [nikhahitId, saraAAId], FeatureTags.GlyphCompositionDecomposition);
+            collection.Replace(i, [nikhahitId, saraAAId], KnownFeatureTags.GlyphCompositionDecomposition);
             collection[i].CodePoint = new CodePoint(nikhahitCodepoint);
             collection[i + 1].CodePoint = new CodePoint(saraAACodepoint);
             end++;
diff --git a/src/SixLabors.Fonts/Tables/AdvancedTypographic/Shapers/UniversalShaper.cs b/src/SixLabors.Fonts/Tables/AdvancedTypographic/Shapers/UniversalShaper.cs
@@ -163,7 +163,7 @@ private void DecomposeSplitVowels(IGlyphShapingCollection collection, int index,
 
                 if (shouldDecompose)
                 {
-                    substitutionCollection.Replace(i, ids, FeatureTags.GlyphCompositionDecomposition);
+                    substitutionCollection.Replace(i, ids, KnownFeatureTags.GlyphCompositionDecomposition);
                     for (int j = 0; j < decompositions.Length; j++)
                     {
                         substitutionCollection[i + j].CodePoint = new(decompositions[j]);
@@ -353,7 +353,7 @@ private void Reorder(IGlyphShapingCollection collection, int index, int count)
                         glyphs[0] = current.GlyphId;
                         glyphs[1] = circleId;
 
-                        substitutionCollection.Replace(i, glyphs, FeatureTags.GlyphCompositionDecomposition);
+                        substitutionCollection.Replace(i, glyphs, KnownFeatureTags.GlyphCompositionDecomposition);
 
                         // Update shaping info for newly inserted data.
                         GlyphShapingData dotted = substitutionCollection[i + 1];
diff --git a/src/SixLabors.Fonts/Tables/AdvancedTypographic/Tag.cs b/src/SixLabors.Fonts/Tables/AdvancedTypographic/Tag.cs
@@ -30,10 +30,10 @@ namespace SixLabors.Fonts.Tables.AdvancedTypographic;
     public static implicit operator Tag(uint value) => new(value);
 
     /// <summary>
-    /// Implicitly converts a <see cref="FeatureTags"/> to a <see cref="Tag"/>.
+    /// Implicitly converts a <see cref="KnownFeatureTags"/> to a <see cref="Tag"/>.
     /// </summary>
     /// <param name="value">The feature tag enum value.</param>
-    public static implicit operator Tag(FeatureTags value) => new((uint)value);
+    public static implicit operator Tag(KnownFeatureTags value) => new((uint)value);
 
     /// <summary>
     /// Determines whether two <see cref="Tag"/> instances are equal.
diff --git a/src/SixLabors.Fonts/TextLayout.cs b/src/SixLabors.Fonts/TextLayout.cs
@@ -1061,7 +1061,7 @@ private static void SubstituteBidiMirrors(FontMetrics fontMetrics, GlyphSubstitu
 
             if (fontMetrics.TryGetGlyphId(mirror, out ushort glyphId))
             {
-                collection.Replace(i, glyphId, FeatureTags.RightToLeftMirroredForms);
+                collection.Replace(i, glyphId, KnownFeatureTags.RightToLeftMirroredForms);
             }
         }
 
@@ -1087,7 +1087,7 @@ private static void SubstituteBidiMirrors(FontMetrics fontMetrics, GlyphSubstitu
 
             if (fontMetrics.TryGetGlyphId(mirror, out ushort glyphId))
             {
-                collection.Replace(i, glyphId, FeatureTags.VerticalAlternates);
+                collection.Replace(i, glyphId, KnownFeatureTags.VerticalAlternates);
             }
         }
     }
diff --git a/tests/SixLabors.Fonts.Tests/Tables/AdvancedTypographic/Gsub/GSubTableTests.cs b/tests/SixLabors.Fonts.Tests/Tables/AdvancedTypographic/Gsub/GSubTableTests.cs
@@ -81,7 +81,7 @@ public void ContextualFractions_WithFractionSlash_Works()
         int[] expectedGlyphIndices = [580, 404, 453];
 
         // act
-        TextRenderer.RenderTextTo(renderer, testStr, new TextOptions(font) { FeatureTags = new Tag[] { FeatureTags.Numerators, FeatureTags.Denominators } });
+        TextRenderer.RenderTextTo(renderer, testStr, new TextOptions(font) { FeatureTags = new Tag[] { KnownFeatureTags.Numerators, KnownFeatureTags.Denominators } });
 
         // assert
         Assert.Equal(expectedGlyphIndices.Length, renderer.GlyphKeys.Count);
@@ -101,7 +101,7 @@ public void ContextualFractions_WithSlash_Works()
         int[] expectedGlyphIndices = [580, 404, 453];
 
         // act
-        TextRenderer.RenderTextTo(renderer, testStr, new TextOptions(font) { FeatureTags = new Tag[] { FeatureTags.Fractions } });
+        TextRenderer.RenderTextTo(renderer, testStr, new TextOptions(font) { FeatureTags = new Tag[] { KnownFeatureTags.Fractions } });
 
         // assert
         Assert.Equal(expectedGlyphIndices.Length, renderer.GlyphKeys.Count);
@@ -357,7 +357,7 @@ public void OldStyleFiguresFeature_Works()
         // act
         TextRenderer.RenderTextTo(renderer, testStr, new TextOptions(font)
         {
-            FeatureTags = new List<Tag> { FeatureTags.OldstyleFigures }
+            FeatureTags = new List<Tag> { KnownFeatureTags.OldstyleFigures }
         });
 
         // assert
diff --git a/tests/SixLabors.Fonts.Tests/TextOptionsTests.cs b/tests/SixLabors.Fonts.Tests/TextOptionsTests.cs
@@ -313,7 +313,7 @@ public void NonDefaultClone()
             DecorationPositioningMode = DecorationPositioningMode.GlyphFont,
             WrappingLength = 42F,
             Tracking = 66F,
-            FeatureTags = new List<Tag> { FeatureTags.OldstyleFigures }
+            FeatureTags = new List<Tag> { KnownFeatureTags.OldstyleFigures }
         };
 
         TextOptions actual = new(expected);

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace SixLabors.Fonts.Tables.AdvancedTypographic;`
`7`	`7`	`/// Provides enumeration for the different font features.`
`8`	`8`	`/// <see href="https://docs.microsoft.com/en-us/typography/opentype/spec/featuretags"/>`
`9`	`9`	`/// </summary>`
`10`		`-public enum FeatureTags : uint`
	`10`	`+public enum KnownFeatureTags : uint`
`11`	`11`	`{`
`12`	`12`	`/// <summary>`
`13`	`13`	`/// Access All Alternates. Shortcode: aalt.`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ private static void ComposeHebrewForms(GlyphSubstitutionCollection collection, F`
`147`	`147`	`if (composed != 0 && fontMetrics.TryGetGlyphId(new CodePoint(composed), out ushort composedGlyphId))`
`148`	`148`	`{`
`149`	`149`	`// Replace the two glyphs with the composed form.`
`150`		`- collection.Replace(i - 1, 2, composedGlyphId, FeatureTags.GlyphCompositionDecomposition);`
	`150`	`+ collection.Replace(i - 1, 2, composedGlyphId, KnownFeatureTags.GlyphCompositionDecomposition);`
`151`	`151`	`end--;`
`152`	`152`	`i--;`
`153`	`153`	`}`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ protected override void AssignFeatures(IGlyphShapingCollection collection, int i`
`193`	`193`
`194`	`194`	`if (shouldDecompose)`
`195`	`195`	`{`
`196`		`- substitutionCollection.Replace(i, ids, FeatureTags.GlyphCompositionDecomposition);`
	`196`	`+ substitutionCollection.Replace(i, ids, KnownFeatureTags.GlyphCompositionDecomposition);`
`197`	`197`	`for (int j = 0; j < decompositions.Length; j++)`
`198`	`198`	`{`
`199`	`199`	`substitutionCollection[i + j].CodePoint = new(decompositions[j]);`
`@@ -382,7 +382,7 @@ private void InitialReorder(IGlyphShapingCollection collection, int index, int c`
`382`	`382`	`glyphs[0] = circleId;`
`383`	`383`	`glyphs[1] = current.GlyphId;`
`384`	`384`
`385`		`- substitutionCollection.Replace(i, glyphs, FeatureTags.GlyphCompositionDecomposition);`
	`385`	`+ substitutionCollection.Replace(i, glyphs, KnownFeatureTags.GlyphCompositionDecomposition);`
`386`	`386`
`387`	`387`	`// The dotted circle is now at position i (inherits original shaping info).`
`388`	`388`	`// Update it to be a dotted circle base.`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ private void DecomposeSplitVowels(IGlyphShapingCollection collection, int index,`
`163`	`163`
`164`	`164`	`if (shouldDecompose)`
`165`	`165`	`{`
`166`		`- substitutionCollection.Replace(i, ids, FeatureTags.GlyphCompositionDecomposition);`
	`166`	`+ substitutionCollection.Replace(i, ids, KnownFeatureTags.GlyphCompositionDecomposition);`
`167`	`167`	`for (int j = 0; j < decompositions.Length; j++)`
`168`	`168`	`{`
`169`	`169`	`substitutionCollection[i + j].CodePoint = new(decompositions[j]);`
`@@ -353,7 +353,7 @@ private void Reorder(IGlyphShapingCollection collection, int index, int count)`
`353`	`353`	`glyphs[0] = current.GlyphId;`
`354`	`354`	`glyphs[1] = circleId;`
`355`	`355`
`356`		`- substitutionCollection.Replace(i, glyphs, FeatureTags.GlyphCompositionDecomposition);`
	`356`	`+ substitutionCollection.Replace(i, glyphs, KnownFeatureTags.GlyphCompositionDecomposition);`
`357`	`357`
`358`	`358`	`// Update shaping info for newly inserted data.`
`359`	`359`	`GlyphShapingData dotted = substitutionCollection[i + 1];`
Original file line number	Diff line number	Diff line change
`@@ -1061,7 +1061,7 @@ private static void SubstituteBidiMirrors(FontMetrics fontMetrics, GlyphSubstitu`
`1061`	`1061`
`1062`	`1062`	`if (fontMetrics.TryGetGlyphId(mirror, out ushort glyphId))`
`1063`	`1063`	`{`
`1064`		`- collection.Replace(i, glyphId, FeatureTags.RightToLeftMirroredForms);`
	`1064`	`+ collection.Replace(i, glyphId, KnownFeatureTags.RightToLeftMirroredForms);`
`1065`	`1065`	`}`
`1066`	`1066`	`}`
`1067`	`1067`
`@@ -1087,7 +1087,7 @@ private static void SubstituteBidiMirrors(FontMetrics fontMetrics, GlyphSubstitu`
`1087`	`1087`
`1088`	`1088`	`if (fontMetrics.TryGetGlyphId(mirror, out ushort glyphId))`
`1089`	`1089`	`{`
`1090`		`- collection.Replace(i, glyphId, FeatureTags.VerticalAlternates);`
	`1090`	`+ collection.Replace(i, glyphId, KnownFeatureTags.VerticalAlternates);`
`1091`	`1091`	`}`
`1092`	`1092`	`}`
`1093`	`1093`	`}`