From 683ab362d8a4a6aa456646c921645715c5d264ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Zi=C4=85bek?= <marcin.ziabek@uj.edu.pl>
Date: Sun, 29 Aug 2021 20:14:48 +0200
Subject: [PATCH] Added support for registering font types based on the
 suggestion of brendonparker

---
 QuestPDF.Examples/BarCode.cs                  |  32 ++++++++++++++++++
 QuestPDF.Examples/LibreBarcode39-Regular.ttf  | Bin 0 -> 14776 bytes
 QuestPDF.Examples/QuestPDF.Examples.csproj    |   6 ++++
 .../{CanvasCache.cs => FontManager.cs}        |  27 ++++++++++++---
 4 files changed, 60 insertions(+), 5 deletions(-)
 create mode 100644 QuestPDF.Examples/BarCode.cs
 create mode 100644 QuestPDF.Examples/LibreBarcode39-Regular.ttf
 rename QuestPDF/Drawing/{CanvasCache.cs => FontManager.cs} (69%)

diff --git a/QuestPDF.Examples/BarCode.cs b/QuestPDF.Examples/BarCode.cs
new file mode 100644
index 0000000..dd83261
--- /dev/null
+++ b/QuestPDF.Examples/BarCode.cs
@@ -0,0 +1,32 @@
+using System.IO;
+using NUnit.Framework;
+using QuestPDF.Drawing;
+using QuestPDF.Examples.Engine;
+using QuestPDF.Fluent;
+using QuestPDF.Helpers;
+using QuestPDF.Infrastructure;
+
+namespace QuestPDF.Examples
+{
+    public class BarCode
+    {
+        [Test]
+        public void Example()
+        {
+            FontManager.RegisterFontType("LibreBarcode39", File.OpenRead("LibreBarcode39-Regular.ttf"));
+            
+            RenderingTest
+                .Create()
+                .PageSize(400, 100)
+                .FileName()
+                .Render(container =>
+                {
+                    container
+                        .Background(Colors.White)
+                        .AlignCenter()
+                        .AlignMiddle()
+                        .Text("*QuestPDF*", TextStyle.Default.FontType("LibreBarcode39").Size(64));
+                });
+        }
+    }
+}
\ No newline at end of file
diff --git a/QuestPDF.Examples/LibreBarcode39-Regular.ttf b/QuestPDF.Examples/LibreBarcode39-Regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..5fcfc55a2f03742e261096304f137e03f4fdb252
GIT binary patch
literal 14776
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
O!ysS)=PKXT+yB4hCTRiy

literal 0
HcmV?d00001

diff --git a/QuestPDF.Examples/QuestPDF.Examples.csproj b/QuestPDF.Examples/QuestPDF.Examples.csproj
index 2e9494a..fb5be83 100644
--- a/QuestPDF.Examples/QuestPDF.Examples.csproj
+++ b/QuestPDF.Examples/QuestPDF.Examples.csproj
@@ -16,4 +16,10 @@
       <ProjectReference Include="..\QuestPDF\QuestPDF.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <None Update="LibreBarcode39-Regular.ttf">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+    </ItemGroup>
+
 </Project>
diff --git a/QuestPDF/Drawing/CanvasCache.cs b/QuestPDF/Drawing/FontManager.cs
similarity index 69%
rename from QuestPDF/Drawing/CanvasCache.cs
rename to QuestPDF/Drawing/FontManager.cs
index 9037309..4bdace2 100644
--- a/QuestPDF/Drawing/CanvasCache.cs
+++ b/QuestPDF/Drawing/FontManager.cs
@@ -1,15 +1,23 @@
-using System.Collections.Concurrent;
+using System;
+using System.Collections.Concurrent;
+using System.IO;
 using QuestPDF.Drawing.SpacePlan;
 using QuestPDF.Infrastructure;
 using SkiaSharp;
 
 namespace QuestPDF.Drawing
 {
-    internal static class CanvasCache
+    public static class FontManager
     {
+        private static ConcurrentDictionary<string, SKTypeface> Typefaces = new ConcurrentDictionary<string, SKTypeface>();
         private static ConcurrentDictionary<string, SKPaint> Paints = new ConcurrentDictionary<string, SKPaint>();
         private static ConcurrentDictionary<string, SKPaint> ColorPaint = new ConcurrentDictionary<string, SKPaint>();
 
+        public static void RegisterFontType(string fontName, Stream stream)
+        {
+            Typefaces.TryAdd(fontName, SKTypeface.FromStream(stream));
+        }
+        
         internal static SKPaint ColorToPaint(this string color)
         {
             return ColorPaint.GetOrAdd(color, Convert);
@@ -29,12 +37,10 @@ namespace QuestPDF.Drawing
             
             static SKPaint Convert(TextStyle style)
             {
-                var slant = style.IsItalic ? SKFontStyleSlant.Italic : SKFontStyleSlant.Upright;
-                
                 return new SKPaint
                 {
                     Color = SKColor.Parse(style.Color),
-                    Typeface = SKTypeface.FromFamilyName(style.FontType, (int)style.FontWeight, (int)SKFontStyleWidth.Normal, slant),
+                    Typeface = GetTypeface(style),
                     TextSize = style.Size,
                     TextEncoding = SKTextEncoding.Utf32,
                     
@@ -47,6 +53,17 @@ namespace QuestPDF.Drawing
                     }
                 };
             }
+
+            static SKTypeface GetTypeface(TextStyle style)
+            {
+                if (Typefaces.TryGetValue(style.FontType, out var result))
+                    return result;
+                
+                var slant = style.IsItalic ? SKFontStyleSlant.Italic : SKFontStyleSlant.Upright;
+                
+                return SKTypeface.FromFamilyName(style.FontType, (int)style.FontWeight, (int)SKFontStyleWidth.Normal, slant) 
+                       ?? throw new ArgumentException($"The typeface {style.FontType} could not be found.");
+            }
         }
 
         internal static TextMeasurement BreakText(this TextStyle style, string text, float availableWidth)