Merge pull request #14 from veudal/new-font

New font added

Author: ashtonav

src/Captcha.Core/Captcha.Core.csproj

@@ -7,9 +7,23 @@
     <RootNamespace>Captcha.Core</RootNamespace>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="Resources\Fonts\Caveat-Bold.ttf" />
+    <None Remove="Resources\Fonts\Caveat-Regular.ttf" />
+    <None Remove="Resources\Fonts\Caveat-SemiBold.ttf" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="SkiaSharp" Version="3.119.0" />
     <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="3.119.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\Fonts\Caveat-Bold.ttf" />
+    <EmbeddedResource Include="Resources\Fonts\Caveat-Regular.ttf">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Fonts\Caveat-SemiBold.ttf" />
+  </ItemGroup>
+
 </Project>

src/Captcha.Core/Resources/Fonts/Caveat-Bold.ttf

@@ -110,17 +110,27 @@ private static void FillInTheBackground(CaptchaConfigurationData config, SKRect
 
     private static SKTypeface GetTypefaceThatCanRenderText(string text)
     {
-        var mainTypeface = SKTypeface.FromFamilyName(Constants.DefaultCaptchaFontName);
-        var mainFont = new SKFont(mainTypeface);
-
-        if (!mainFont.ContainsGlyphs(text))
+        // Try to load Caveat font from embedded resource
+        var assembly = typeof(CaptchaImageService).Assembly;
+        using var stream = assembly.GetManifestResourceStream("Captcha.Core.Resources.Fonts.Caveat-SemiBold.ttf");
+        if (stream != null)
         {
-            return SKTypeface.FromFamilyName(Constants.DefaultCaptchaFallbackFontName);
+            var typeface = SKTypeface.FromStream(stream);
+            if (typeface != null)
+            {
+                var font = new SKFont(typeface);
+                if (font.ContainsGlyphs(text))
+                {
+                    return typeface;
+                }
+            }
         }
 
-        return mainTypeface;
+        // Fallback if Caveat is missing or doesn't support text
+        return SKTypeface.Default;
     }
 
+
     /// <summary>
     /// This method applies similar logic to GraphicsPath.Warp() from System.Drawing.Common
     /// https://stackoverflow.com/questions/48416118/perspective-transform-in-skia