SixLabors · JimBobSquarePants · May 11, 2026 · May 10, 2026
diff --git a/src/SixLabors.Fonts/TextBlock.cs b/src/SixLabors.Fonts/TextBlock.cs
@@ -498,11 +498,10 @@ private static int FindWordMetricIndex(List<WordSegmentRun> wordSegments, int gr
     /// <param name="metrics">The word metrics to inspect.</param>
     /// <returns><see langword="true"/> when a grapheme has been accumulated for the segment.</returns>
     private static bool HasWordMetrics(in WordMetrics metrics)
-    {
+
         // Default WordMetrics has no source range. Any real word segment has an exclusive end
         // index, so the range is the sentinel that avoids treating FontRectangle.Empty as geometry.
-        return metrics.GraphemeEnd != 0 || metrics.StringEnd != 0;
-    }
+        => metrics.GraphemeEnd != 0 || metrics.StringEnd != 0;
 
     /// <summary>
     /// Gets one per-glyph metrics collection by streaming laid-out glyphs.

diff --git a/src/SixLabors.Fonts/TextLineBreakEnumerator.cs b/src/SixLabors.Fonts/TextLineBreakEnumerator.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-using System.Collections.Generic;
 using SixLabors.Fonts.Unicode;
 
 namespace SixLabors.Fonts;

diff --git a/tests/Images/ReferenceOutput/BreakWordEnsuresSingleCharacterPerLine_1.png b/tests/Images/ReferenceOutput/BreakWordEnsuresSingleCharacterPerLine_1.png
diff --git a/tests/Images/ReferenceOutput/CanRenderEmojiFont_With_COLRv1-.png b/tests/Images/ReferenceOutput/CanRenderEmojiFont_With_COLRv1-.png
diff --git a/tests/Images/ReferenceOutput/CanRenderEmojiFont_With_COLRv1_-G-.png b/tests/Images/ReferenceOutput/CanRenderEmojiFont_With_COLRv1_-G-.png
diff --git a/tests/Images/ReferenceOutput/CanRenderEmojiFont_With_SVG-.png b/tests/Images/ReferenceOutput/CanRenderEmojiFont_With_SVG-.png
diff --git a/tests/Images/ReferenceOutput/CanRenderEmojiFont_With_SVG_-G-.png b/tests/Images/ReferenceOutput/CanRenderEmojiFont_With_SVG_-G-.png
diff --git a/...Images/ReferenceOutput/CanRenderEmojiSanityMatrix_With_COLRv1_-full-string-.png b/...Images/ReferenceOutput/CanRenderEmojiSanityMatrix_With_COLRv1_-full-string-.png
diff --git a/tests/Images/ReferenceOutput/CanRenderEmojiSanityMatrix_With_SVG_-full-string-.png b/tests/Images/ReferenceOutput/CanRenderEmojiSanityMatrix_With_SVG_-full-string-.png
diff --git a/.../Images/ReferenceOutput/CanRenderProblemEmojiTransforms_With_COLRv1_-clown-.png b/.../Images/ReferenceOutput/CanRenderProblemEmojiTransforms_With_COLRv1_-clown-.png
diff --git a/...ReferenceOutput/CanRenderProblemEmojiTransforms_With_COLRv1_-heart-on-fire-.png b/...ReferenceOutput/CanRenderProblemEmojiTransforms_With_COLRv1_-heart-on-fire-.png
diff --git a/tests/Images/ReferenceOutput/CanRenderProblemEmojiTransforms_With_COLRv1_-leg-.png b/tests/Images/ReferenceOutput/CanRenderProblemEmojiTransforms_With_COLRv1_-leg-.png
diff --git a/...ReferenceOutput/CanRenderProblemEmojiTransforms_With_COLRv1_-mending-heart-.png b/...ReferenceOutput/CanRenderProblemEmojiTransforms_With_COLRv1_-mending-heart-.png
diff --git a/.../Images/ReferenceOutput/CanRenderProblemEmojiTransforms_With_COLRv1_-robot-.png b/.../Images/ReferenceOutput/CanRenderProblemEmojiTransforms_With_COLRv1_-robot-.png
diff --git a/tests/Images/ReferenceOutput/CanRenderProblemEmojiTransforms_With_SVG_-clown-.png b/tests/Images/ReferenceOutput/CanRenderProblemEmojiTransforms_With_SVG_-clown-.png
diff --git a/...es/ReferenceOutput/CanRenderProblemEmojiTransforms_With_SVG_-heart-on-fire-.png b/...es/ReferenceOutput/CanRenderProblemEmojiTransforms_With_SVG_-heart-on-fire-.png
diff --git a/tests/Images/ReferenceOutput/CanRenderProblemEmojiTransforms_With_SVG_-leg-.png b/tests/Images/ReferenceOutput/CanRenderProblemEmojiTransforms_With_SVG_-leg-.png
diff --git a/...es/ReferenceOutput/CanRenderProblemEmojiTransforms_With_SVG_-mending-heart-.png b/...es/ReferenceOutput/CanRenderProblemEmojiTransforms_With_SVG_-mending-heart-.png
diff --git a/tests/Images/ReferenceOutput/CanRenderProblemEmojiTransforms_With_SVG_-robot-.png b/tests/Images/ReferenceOutput/CanRenderProblemEmojiTransforms_With_SVG_-robot-.png
diff --git a/tests/Images/ReferenceOutput/CaretPosition_DrawsMovedCarets_-ltr-.png b/tests/Images/ReferenceOutput/CaretPosition_DrawsMovedCarets_-ltr-.png
diff --git a/tests/Images/ReferenceOutput/CaretPosition_DrawsMovedCarets_-rtl-.png b/tests/Images/ReferenceOutput/CaretPosition_DrawsMovedCarets_-rtl-.png
diff --git a/tests/Images/ReferenceOutput/CaretPosition_DrawsStartAndEndCarets_-ltr-.png b/tests/Images/ReferenceOutput/CaretPosition_DrawsStartAndEndCarets_-ltr-.png
diff --git a/tests/Images/ReferenceOutput/CaretPosition_DrawsStartAndEndCarets_-rtl-.png b/tests/Images/ReferenceOutput/CaretPosition_DrawsStartAndEndCarets_-rtl-.png
diff --git a/tests/Images/ReferenceOutput/CountLinesWrappingLength_100-3.png b/tests/Images/ReferenceOutput/CountLinesWrappingLength_100-3.png
diff --git a/tests/Images/ReferenceOutput/CountLinesWrappingLength_200-3.png b/tests/Images/ReferenceOutput/CountLinesWrappingLength_200-3.png
diff --git a/tests/Images/ReferenceOutput/CountLinesWrappingLength_25-6.png b/tests/Images/ReferenceOutput/CountLinesWrappingLength_25-6.png
diff --git a/tests/Images/ReferenceOutput/CountLinesWrappingLength_50-4.png b/tests/Images/ReferenceOutput/CountLinesWrappingLength_50-4.png
diff --git a/...renceOutput/FontTracking_CorrectlyAddSpacingForComposedCharacterHRef_-र्कि-.png b/...renceOutput/FontTracking_CorrectlyAddSpacingForComposedCharacterHRef_-र्कि-.png
diff --git a/...eOutput/FontTracking_CorrectlyAddSpacingForComposedCharacterHRef_-र्किर्कि-.png b/...eOutput/FontTracking_CorrectlyAddSpacingForComposedCharacterHRef_-र्किर्कि-.png
diff --git a/...eferenceOutput/FontTracking_CorrectlyAddSpacingForComposedCharacterHRef_-ि-.png b/...eferenceOutput/FontTracking_CorrectlyAddSpacingForComposedCharacterHRef_-ि-.png
diff --git a/...ferenceOutput/FontTracking_CorrectlyAddSpacingForComposedCharacterHRef_-िa-.png b/...ferenceOutput/FontTracking_CorrectlyAddSpacingForComposedCharacterHRef_-िa-.png
diff --git a/...enceOutput/FontTracking_CorrectlyAddSpacingForComposedCharacterVMRef_-र्कि-.png b/...enceOutput/FontTracking_CorrectlyAddSpacingForComposedCharacterVMRef_-र्कि-.png
diff --git a/...Output/FontTracking_CorrectlyAddSpacingForComposedCharacterVMRef_-र्किर्कि-.png b/...Output/FontTracking_CorrectlyAddSpacingForComposedCharacterVMRef_-र्किर्कि-.png
diff --git a/...ferenceOutput/FontTracking_CorrectlyAddSpacingForComposedCharacterVMRef_-ि-.png b/...ferenceOutput/FontTracking_CorrectlyAddSpacingForComposedCharacterVMRef_-ि-.png
diff --git a/...erenceOutput/FontTracking_CorrectlyAddSpacingForComposedCharacterVMRef_-िa-.png b/...erenceOutput/FontTracking_CorrectlyAddSpacingForComposedCharacterVMRef_-िa-.png
diff --git a/...renceOutput/FontTracking_CorrectlyAddSpacingForComposedCharacterVRef_-र्कि-.png b/...renceOutput/FontTracking_CorrectlyAddSpacingForComposedCharacterVRef_-र्कि-.png
diff --git a/...eOutput/FontTracking_CorrectlyAddSpacingForComposedCharacterVRef_-र्किर्कि-.png b/...eOutput/FontTracking_CorrectlyAddSpacingForComposedCharacterVRef_-र्किर्कि-.png
diff --git a/...eferenceOutput/FontTracking_CorrectlyAddSpacingForComposedCharacterVRef_-ि-.png b/...eferenceOutput/FontTracking_CorrectlyAddSpacingForComposedCharacterVRef_-ि-.png
diff --git a/...ferenceOutput/FontTracking_CorrectlyAddSpacingForComposedCharacterVRef_-िa-.png b/...ferenceOutput/FontTracking_CorrectlyAddSpacingForComposedCharacterVRef_-िa-.png
diff --git a/.../ReferenceOutput/GraphemeMetrics_GetSelectionBounds_DrawsBidiDragSelection-.png b/.../ReferenceOutput/GraphemeMetrics_GetSelectionBounds_DrawsBidiDragSelection-.png
diff --git a/...phemeMetrics_GetSelectionBounds_DrawsGraphemeSelections_HorizontalBottomTop.png b/...phemeMetrics_GetSelectionBounds_DrawsGraphemeSelections_HorizontalBottomTop.png
diff --git a/...phemeMetrics_GetSelectionBounds_DrawsGraphemeSelections_HorizontalTopBottom.png b/...phemeMetrics_GetSelectionBounds_DrawsGraphemeSelections_HorizontalTopBottom.png
diff --git a/...raphemeMetrics_GetSelectionBounds_DrawsGraphemeSelections_VerticalLeftRight.png b/...raphemeMetrics_GetSelectionBounds_DrawsGraphemeSelections_VerticalLeftRight.png
diff --git a/...meMetrics_GetSelectionBounds_DrawsGraphemeSelections_VerticalMixedLeftRight.png b/...meMetrics_GetSelectionBounds_DrawsGraphemeSelections_VerticalMixedLeftRight.png
diff --git a/...meMetrics_GetSelectionBounds_DrawsGraphemeSelections_VerticalMixedRightLeft.png b/...meMetrics_GetSelectionBounds_DrawsGraphemeSelections_VerticalMixedRightLeft.png
diff --git a/...raphemeMetrics_GetSelectionBounds_DrawsGraphemeSelections_VerticalRightLeft.png b/...raphemeMetrics_GetSelectionBounds_DrawsGraphemeSelections_VerticalRightLeft.png
diff --git a/...renceOutput/GraphemeMetrics_GetSelectionBounds_DrawsSelectionWithBlankLine-.png b/...renceOutput/GraphemeMetrics_GetSelectionBounds_DrawsSelectionWithBlankLine-.png
diff --git a/tests/Images/ReferenceOutput/Issue_444_A_860.png b/tests/Images/ReferenceOutput/Issue_444_A_860.png
diff --git a/tests/Images/ReferenceOutput/Issue_444_B_860.png b/tests/Images/ReferenceOutput/Issue_444_B_860.png
diff --git a/tests/Images/ReferenceOutput/Issue_444_C_860.png b/tests/Images/ReferenceOutput/Issue_444_C_860.png
diff --git a/tests/Images/ReferenceOutput/Issue_444_D_860.png b/tests/Images/ReferenceOutput/Issue_444_D_860.png
diff --git a/tests/Images/ReferenceOutput/Issue_444_E_860.png b/tests/Images/ReferenceOutput/Issue_444_E_860.png
diff --git a/tests/Images/ReferenceOutput/Issue_446_A_860.png b/tests/Images/ReferenceOutput/Issue_446_A_860.png
diff --git a/tests/Images/ReferenceOutput/Issue_446_B_860.png b/tests/Images/ReferenceOutput/Issue_446_B_860.png
diff --git a/tests/Images/ReferenceOutput/Issue_448_150.png b/tests/Images/ReferenceOutput/Issue_448_150.png
diff --git a/tests/Images/ReferenceOutput/Issue_450_960.png b/tests/Images/ReferenceOutput/Issue_450_960.png
diff --git a/tests/Images/ReferenceOutput/Issue_451_A-.png b/tests/Images/ReferenceOutput/Issue_451_A-.png
diff --git a/tests/Images/ReferenceOutput/Issue_451_B-.png b/tests/Images/ReferenceOutput/Issue_451_B-.png
diff --git a/tests/Images/ReferenceOutput/Issue_451_C-.png b/tests/Images/ReferenceOutput/Issue_451_C-.png
diff --git a/tests/Images/ReferenceOutput/LineLayoutEnumerator_DrawsManualFlowAroundCircle-.png b/tests/Images/ReferenceOutput/LineLayoutEnumerator_DrawsManualFlowAroundCircle-.png
diff --git a/...ferenceOutput/LineMetrics_StartAndExtent_DrawsLineBoxes_HorizontalBottomTop.png b/...ferenceOutput/LineMetrics_StartAndExtent_DrawsLineBoxes_HorizontalBottomTop.png
diff --git a/...ferenceOutput/LineMetrics_StartAndExtent_DrawsLineBoxes_HorizontalTopBottom.png b/...ferenceOutput/LineMetrics_StartAndExtent_DrawsLineBoxes_HorizontalTopBottom.png
diff --git a/...ReferenceOutput/LineMetrics_StartAndExtent_DrawsLineBoxes_VerticalLeftRight.png b/...ReferenceOutput/LineMetrics_StartAndExtent_DrawsLineBoxes_VerticalLeftRight.png
diff --git a/...enceOutput/LineMetrics_StartAndExtent_DrawsLineBoxes_VerticalMixedLeftRight.png b/...enceOutput/LineMetrics_StartAndExtent_DrawsLineBoxes_VerticalMixedLeftRight.png
diff --git a/...enceOutput/LineMetrics_StartAndExtent_DrawsLineBoxes_VerticalMixedRightLeft.png b/...enceOutput/LineMetrics_StartAndExtent_DrawsLineBoxes_VerticalMixedRightLeft.png