Merge pull request #278 from SixLabors/js/update-fonts

Update to latest Fonts and implement upstream clipper fix

Author: JimBobSquarePants

src/ImageSharp.Drawing/ImageSharp.Drawing.csproj

@@ -18,7 +18,7 @@
     <None Include="..\..\shared-infrastructure\branding\icons\imagesharp.drawing\sixlabors.imagesharp.drawing.128.png" Pack="true" PackagePath="" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta19.13" />
+    <PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta19.19" />
     <PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
   </ItemGroup>
   <Import Project="..\..\shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems" Label="Shared" />

src/ImageSharp.Drawing/Processing/Processors/Text/RichTextGlyphRenderer.cs

@@ -39,7 +39,7 @@ internal sealed class RichTextGlyphRenderer : BaseGlyphBuilder, IColorGlyphRende
         private TextDecorationDetails? currentUnderline;
         private TextDecorationDetails? currentStrikout;
         private TextDecorationDetails? currentOverline;
-        private bool currentDecorationRotated;
+        private bool currentDecorationIsVertical;
 
         // Just enough accuracy to allow for 1/8 px differences which later are accumulated while rendering,
         // but do not grow into full px offsets.
@@ -100,7 +100,7 @@ protected override void BeginText(in FontRectangle bounds)
         protected override void BeginGlyph(in FontRectangle bounds, in GlyphRendererParameters parameters)
         {
             this.currentColor = null;
-            this.currentDecorationRotated = parameters.LayoutMode.IsVertical() || parameters.LayoutMode.IsVerticalMixed();
+            this.currentDecorationIsVertical = parameters.LayoutMode is GlyphLayoutMode.Vertical or GlyphLayoutMode.VerticalRotated;
             this.currentTextRun = parameters.TextRun;
             if (parameters.TextRun is RichTextRun drawingRun)
             {
@@ -232,7 +232,7 @@ public override void SetDecoration(TextDecorations textDecorations, Vector2 star
 
             // Drawing is always centered around the point so we need to offset by half.
             Vector2 offset = Vector2.Zero;
-            bool rotated = this.currentDecorationRotated;
+            bool rotated = this.currentDecorationIsVertical;
             if (textDecorations == TextDecorations.Overline)
             {
                 // CSS overline is drawn above the position, so we need to move it up.

src/ImageSharp.Drawing/Shapes/PolygonClipper/ClipperOffset.cs

@@ -11,7 +11,7 @@ namespace SixLabors.ImageSharp.Drawing.Shapes.PolygonClipper
     /// </summary>
     internal class ClipperOffset
     {
-        // To make the floating point polygons compatable with clipper we have to scale them.
+        // To make the floating point polygons compatible with clipper we have to scale them.
         private const float ScalingFactor = 1000F;
         private readonly PolygonOffsetter polygonClipperOffset;
 

src/ImageSharp.Drawing/Shapes/PolygonClipper/PolygonClipper.cs

@@ -86,7 +86,7 @@ public void Execute(ClippingOperation clipType, FillRule fillRule, PathsF soluti
             }
             catch (Exception ex)
             {
-                throw new ClipperException("An error occured while attempting to clip the polygon. See the inner exception for details.", ex);
+                throw new ClipperException("An error occurred while attempting to clip the polygon. See the inner exception for details.", ex);
             }
             finally
             {

src/ImageSharp.Drawing/Shapes/PolygonClipper/PolygonOffsetter.cs

@@ -15,6 +15,7 @@ namespace SixLabors.ImageSharp.Drawing.Shapes.PolygonClipper
     /// </summary>
     internal sealed class PolygonOffsetter
     {
+        private const float Tolerance = 1.0E-6F;
         private readonly List<Group> groupList = new();
         private readonly PathF normals = new();
         private readonly PathsF solution = new();
@@ -102,10 +103,10 @@ public void Execute(float delta, PathsF solution)
 
             Error:
 
-            // PolygonClipper will throw for unhandled exceptions but we need to explcitly capture an empty result.
+            // PolygonClipper will throw for unhandled exceptions but we need to explicitly capture an empty result.
             if (solution.Count == 0)
             {
-                throw new ClipperException("An error occured while attempting to clip the polygon. Check input for invalid entries.");
+                throw new ClipperException("An error occurred while attempting to clip the polygon. Check input for invalid entries.");
             }
         }
 
@@ -326,19 +327,27 @@ private void OffsetOpenPath(Group group, PathF path)
             group.OutPath = new(path.Count);
             int highI = path.Count - 1;
 
-            // do the line start cap
-            switch (this.endType)
+            // Further reduced extraneous vertices in solutions (#499)
+            if (MathF.Abs(this.groupDelta) < Tolerance)
             {
-                case EndCapStyle.Butt:
-                    group.OutPath.Add(path[0] - (this.normals[0] * this.groupDelta));
-                    group.OutPath.Add(this.GetPerpendic(path[0], this.normals[0]));
-                    break;
-                case EndCapStyle.Round:
-                    this.DoRound(group, path, 0, 0, MathF.PI);
-                    break;
-                default:
-                    this.DoSquare(group, path, 0, 0);
-                    break;
+                group.OutPath.Add(path[0]);
+            }
+            else
+            {
+                // do the line start cap
+                switch (this.endType)
+                {
+                    case EndCapStyle.Butt:
+                        group.OutPath.Add(path[0] - (this.normals[0] * this.groupDelta));
+                        group.OutPath.Add(this.GetPerpendic(path[0], this.normals[0]));
+                        break;
+                    case EndCapStyle.Round:
+                        this.DoRound(group, path, 0, 0, MathF.PI);
+                        break;
+                    default:
+                        this.DoSquare(group, path, 0, 0);
+                        break;
+                }
             }
 
             // offset the left side going forward
@@ -410,6 +419,13 @@ private void OffsetPolygon(Group group, PathF path)
 
         private void OffsetPoint(Group group, PathF path, int j, ref int k)
         {
+            // Further reduced extraneous vertices in solutions (#499)
+            if (MathF.Abs(this.groupDelta) < Tolerance)
+            {
+                group.OutPath.Add(path[j]);
+                return;
+            }
+
             // Let A = change in angle where edges join
             // A == 0: ie no change in angle (flat join)
             // A == PI: edges 'spike'
@@ -426,7 +442,12 @@ private void OffsetPoint(Group group, PathF path, int j, ref int k)
                 sinA = -1F;
             }
 
-            if (cosA > -0.99F && (sinA * this.groupDelta < 0F))
+            // almost straight - less than 1 degree (#424)
+            if (cosA > 0.99F)
+            {
+                this.DoMiter(group, path, j, k, cosA);
+            }
+            else if (cosA > -0.99F && (sinA * this.groupDelta < 0F))
             {
                 // is concave
                 group.OutPath.Add(this.GetPerpendic(path[j], this.normals[k]));
@@ -448,12 +469,7 @@ private void OffsetPoint(Group group, PathF path, int j, ref int k)
                     this.DoSquare(group, path, j, k);
                 }
             }
-            else if (cosA > 0.9998F)
-            {
-                // almost straight - less than 1 degree (#424)
-                this.DoMiter(group, path, j, k, cosA);
-            }
-            else if (cosA > 0.99F || this.joinType == JointStyle.Square)
+            else if (this.joinType == JointStyle.Square)
             {
                 // angle less than 8 degrees or a squared join
                 this.DoSquare(group, path, j, k);
@@ -541,7 +557,7 @@ private void DoRound(Group group, PathF path, int j, int k, float angle)
             // avoid 180deg concave
             if (angle > -MathF.PI + .01F)
             {
-                int steps = Math.Max(2, (int)Math.Ceiling(this.stepsPerRad * Math.Abs(angle)));
+                int steps = Math.Max(2, (int)Math.Ceiling(this.stepsPerRad * MathF.Abs(angle)));
 
                 // ie 1 less than steps
                 for (int i = 1; i < steps; i++)

src/ImageSharp.Drawing/Shapes/Text/BaseGlyphBuilder.cs

@@ -151,7 +151,7 @@ public virtual void SetDecoration(TextDecorations textDecorations, Vector2 start
             var renderer = (IGlyphRenderer)this;
 
             // Expand the points to create a rectangle centered around the line.
-            bool rotated = this.parameters.LayoutMode.IsVertical() || this.parameters.LayoutMode.IsVerticalMixed();
+            bool rotated = this.parameters.LayoutMode is GlyphLayoutMode.Vertical or GlyphLayoutMode.VerticalRotated;
             Vector2 pad = rotated ? new(thickness * .5F, 0) : new(0, thickness * .5F);
 
             // Clamp the line to the pixel grid.

tests/ImageSharp.Drawing.Tests/Drawing/Text/DrawTextOnImageTests.cs

@@ -108,7 +108,7 @@ public void DoesntThrowExceptionWhenOverlappingRightEdge_Issue688<TPixel>(TestIm
             using Image<TPixel> img = provider.GetImage();
 
             // Measure the text size
-            FontRectangle size = TextMeasurer.Measure(text, new RichTextOptions(font));
+            FontRectangle size = TextMeasurer.MeasureSize(text, new RichTextOptions(font));
 
             // Find out how much we need to scale the text to fill the space (up or down)
             float scalingFactor = Math.Min(img.Width / size.Width, img.Height / size.Height);
@@ -428,7 +428,7 @@ public void CanDrawTextWithEmptyPath()
             Font font = CreateFont(TestFonts.WendyOne, 72);
             const string text = "Hello\0World";
             RichTextOptions textOptions = new(font);
-            FontRectangle textSize = TextMeasurer.Measure(text, textOptions);
+            FontRectangle textSize = TextMeasurer.MeasureSize(text, textOptions);
 
             Assert.NotEqual(FontRectangle.Empty, textSize);
 
@@ -455,7 +455,7 @@ public void CanRotateFilledFont_Issue175<TPixel>(
             AffineTransformBuilder builder = new AffineTransformBuilder().AppendRotationDegrees(angle);
 
             RichTextOptions textOptions = new(font);
-            FontRectangle bounds = TextMeasurer.Measure(text, textOptions);
+            FontRectangle bounds = TextMeasurer.MeasureSize(text, textOptions);
             Matrix3x2 transform = builder.BuildMatrix(Rectangle.Round(new RectangleF(bounds.X, bounds.Y, bounds.Width, bounds.Height)));
 
             provider.RunValidatingProcessorTest(
@@ -482,7 +482,7 @@ public void CanRotateOutlineFont_Issue175<TPixel>(
             AffineTransformBuilder builder = new AffineTransformBuilder().AppendRotationDegrees(angle);
 
             RichTextOptions textOptions = new(font);
-            FontRectangle bounds = TextMeasurer.Measure(text, textOptions);
+            FontRectangle bounds = TextMeasurer.MeasureSize(text, textOptions);
             Matrix3x2 transform = builder.BuildMatrix(Rectangle.Round(new RectangleF(bounds.X, bounds.Y, bounds.Width, bounds.Height)));
 
             provider.RunValidatingProcessorTest(

tests/ImageSharp.Drawing.Tests/Issues/Issue_46.cs

@@ -28,7 +28,7 @@ public void CanRenderCustomFont()
 
             string iconText = char.ConvertFromUtf32(int.Parse("e926", NumberStyles.HexNumber));
 
-            FontRectangle rect = TextMeasurer.Measure(iconText, options);
+            FontRectangle rect = TextMeasurer.MeasureSize(iconText, options);
 
             float textX = ((imageSize - rect.Width) * 0.5F) + rect.Left;
             float textY = ((imageSize - rect.Height) * 0.5F) + (rect.Top * 0.25F);

tests/ImageSharp.Drawing.Tests/Shapes/SvgPath.cs

@@ -27,7 +27,7 @@ public void RenderSvgPath<TPixel>(TestImageProvider<TPixel> provider, string svg
             provider.RunValidatingProcessorTest(
                 c => c.Fill(Color.White).Draw(Color.Red, 5, path),
                 new { type = exampleImageKey },
-                comparer: ImageComparer.TolerantPercentage(0.002f));
+                comparer: ImageComparer.TolerantPercentage(0.0035F)); // NET 472 x86 requires higher percentage
         }
     }
 }