WIP

Author: Socolin

.github/workflows/build-and-test.yml

@@ -3,8 +3,7 @@ name: Build
 on:
   push:
     branches:
-      - main
-      - ci
+      - *
 jobs:
   # Prime a single LFS cache and expose the exact key for the matrix
   WarmLFS:
@@ -247,7 +246,7 @@ jobs:
         run: |
           $date = Get-Date -Format "yyyy.MM.dd"
           $buildNumber = "${{ github.run_number }}"
-          $version = "$date-mc.$buildNumber"
+          $version = if ($env:GITHUB_REF -eq 'refs/heads/main') { "$date-mc.$buildNumber" } else { $branchName = $env:GITHUB_REF -replace 'refs/heads/', ''; "$date-$branchName.$buildNumber" }
           echo "version=$version" >> $env:GITHUB_OUTPUT
           echo "Computed version: $version"
 

src/SixLabors.Fonts/TextLayout.cs

@@ -1037,6 +1037,8 @@ VerticalOrientationType.Rotate or
                     glyphAdvance = glyph.AdvanceHeight;
                 }
 
+                glyphAdvance += options.Tracking * glyph.FontMetrics.UnitsPerEm;
+
                 decomposedAdvances[0] = glyphAdvance;
 
                 if (CodePoint.IsTabulation(codePoint))

src/SixLabors.Fonts/TextOptions.cs

@@ -170,6 +170,13 @@ public float LineSpacing
     /// </summary>
     public KerningMode KerningMode { get; set; }
 
+    /// <summary>
+    /// Gets or sets the tracking value for uniform letter-spacing adjustment.
+    /// Tracking adjusts the spacing between all characters uniformly and is measured in em.
+    /// Positive values increase spacing, negative values decrease spacing, and zero applies no adjustment.
+    /// </summary>
+    public float Tracking { get; set; }
+
     /// <summary>
     /// Gets or sets the positioning mode used for rendering decorations.
     /// </summary>

tests/SixLabors.Fonts.Tests/TextLayoutTests.cs

@@ -2,6 +2,7 @@
 // Licensed under the Six Labors Split License.
 
 using System.Globalization;
+using System.Net.Mime;
 using System.Numerics;
 using SixLabors.Fonts.Rendering;
 using SixLabors.Fonts.Tests.Fakes;
@@ -968,6 +969,24 @@ public void TrueTypeHinting_CanHintSmallOpenSans(char c, FontRectangle expected)
         Assert.Equal(expected, actual, Comparer);
     }
 
+    /*
+    [Theory]
+    [InlineData("aaaa", 0, 20.952148)]
+    [InlineData("aaaa", 1, 35.600586)]
+    [InlineData("awwa", 1, 35.600586)]
+    [InlineData("aaaa", 0.1, 22.416994)]
+    public void FontTracking_SpaceCharacters(string text, float tracking, float width)
+    {
+        TextOptions options = new(OpenSansTTFLarge)
+        {
+            Tracking = tracking,
+        };
+
+        FontRectangle actual = TextMeasurer.MeasureSize(text, options);
+        Assert.Equal(new FontRectangle(0, 0, width, 5.5371094f), actual, Comparer);
+    }
+    */
+
     [Fact]
     public void CanMeasureTextAdvance()
     {
@@ -1299,6 +1318,7 @@ public void EndLayer()
     }
 
     private static readonly Font OpenSansTTF = new FontCollection().Add(TestFonts.OpenSansFile).CreateFont(10);
+    private static readonly Font OpenSansTTFLarge = new FontCollection().Add(TestFonts.OpenSansFile).CreateFont(64);
     private static readonly Font OpenSansWoff = new FontCollection().Add(TestFonts.OpenSansFile).CreateFont(10);
 
 #if OS_WINDOWS