Merge pull request #167 from SixLabors/js/word-break

Add wordbreaking support
SixLabors · Sep 18, 2021 · 5bbf20e · 5bbf20e
2 parents 22c2a27 + a8ba093
commit 5bbf20e
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 9 deletions.
diff --git a/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj b/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj
@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta15.10" />
+    <PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta15.15" />
     <PackageReference Include="SixLabors.ImageSharp" Version="1.0.3" />
   </ItemGroup>
 

diff --git a/src/ImageSharp.Drawing/Processing/Processors/Text/DrawTextProcessor{TPixel}.cs b/src/ImageSharp.Drawing/Processing/Processors/Text/DrawTextProcessor{TPixel}.cs
@@ -57,6 +57,7 @@ protected override void BeforeImageApply()
                 LineSpacing = this.Options.TextOptions.LineSpacing,
                 FallbackFontFamilies = this.Options.TextOptions.FallbackFonts,
                 ColorFontSupport = this.definition.Options.TextOptions.RenderColorFonts ? ColorFontSupport.MicrosoftColrFormat : ColorFontSupport.None,
+                WordBreaking = this.definition.Options.TextOptions.WordBreaking
             };
 
             this.textRenderer = new CachingGlyphRenderer(

diff --git a/src/ImageSharp.Drawing/Processing/TextOptions.cs b/src/ImageSharp.Drawing/Processing/TextOptions.cs
@@ -122,17 +122,24 @@ public float LineSpacing
         /// defined by the location and width, if <see cref="WrapTextWidth"/> equals zero, and thus
         /// wrapping disabled, then the alignment is relative to the drawing location.
         /// <para/>
-        /// Defaults to <see cref="SixLabors.Fonts.HorizontalAlignment.Left"/>.
+        /// Defaults to <see cref="HorizontalAlignment.Left"/>.
         /// </summary>
         public HorizontalAlignment HorizontalAlignment { get; set; } = HorizontalAlignment.Left;
 
         /// <summary>
         /// Gets or sets a value indicating how to align the text relative to the rendering space.
         /// <para/>
-        /// Defaults to <see cref="SixLabors.Fonts.VerticalAlignment.Top"/>.
+        /// Defaults to <see cref="VerticalAlignment.Top"/>.
         /// </summary>
         public VerticalAlignment VerticalAlignment { get; set; } = VerticalAlignment.Top;
 
+        /// <summary>
+        /// Gets or sets a value indicating what word breaking mode to use when wrapping text.
+        /// <para/>
+        /// Defaults to <see cref="WordBreaking.Normal"/>.
+        /// </summary>
+        public WordBreaking WordBreaking { get; set; } = WordBreaking.Normal;
+
         /// <summary>
         /// Gets the list of fallback font families to apply to the text drawing operation.
         /// <para/>

diff --git a/...sAreRenderedCorrectly_WithLineSpacing_linespacing_1.5_linecount_3_wrap_True.png b/...sAreRenderedCorrectly_WithLineSpacing_linespacing_1.5_linecount_3_wrap_True.png
diff --git a/...pesAreRenderedCorrectly_WithLineSpacing_linespacing_1_linecount_5_wrap_True.png b/...pesAreRenderedCorrectly_WithLineSpacing_linespacing_1_linecount_5_wrap_True.png
diff --git a/...pesAreRenderedCorrectly_WithLineSpacing_linespacing_2_linecount_2_wrap_True.png b/...pesAreRenderedCorrectly_WithLineSpacing_linespacing_2_linecount_2_wrap_True.png