2021.9.0

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));
+                });
+        }
+    }
+}

QuestPDF.Examples/ElementExamples.cs

@@ -755,5 +755,83 @@ namespace QuestPDF.Examples
                         });
                 });
         }
+        
+        [Test]
+        public void ComplexLayout()
+        {
+            RenderingTest
+                .Create()
+                .PageSize(500, 225)
+                .FileName()
+                .Render(container =>
+                {
+                    container
+                        .Padding(25)
+                        .Stack(stack =>
+                        {
+                            stack.Item().Row(row =>
+                            {
+                                row.RelativeColumn().LabelCell("Label 1");
+                                
+                                row.RelativeColumn(3).Grid(grid =>
+                                {
+                                    grid.Columns(3);
+                                    
+                                    grid.Item(2).LabelCell("Label 2");
+                                    grid.Item().LabelCell("Label 3");
+                                    
+                                    grid.Item(2).ValueCell().Text("Value 2");
+                                    grid.Item().ValueCell().Text("Value 3");
+                                });
+                            });
+                            
+                            stack.Item().Row(row =>
+                            {
+                                row.RelativeColumn().ValueCell().Text("Value 1");
+                                
+                                row.RelativeColumn(3).Grid(grid =>
+                                {
+                                    grid.Columns(3);
+                                    
+                                    grid.Item().LabelCell("Label 4");
+                                    grid.Item(2).LabelCell("Label 5");
+                                    
+                                    grid.Item().ValueCell().Text("Value 4");
+                                    grid.Item(2).ValueCell().Text("Value 5");
+                                });
+                            });
+                            
+                            stack.Item().Row(row =>
+                            {
+                                row.RelativeColumn().LabelCell("Label 6");
+                                row.RelativeColumn().ValueCell().Text("Value 6");
+                            });
+                        });
+                });
+        }
+        
+        [Test]
+        public void DomainSpecificLanguage()
+        {
+            RenderingTest
+                .Create()
+                .PageSize(600, 310)
+                .FileName()
+                .Render(container =>
+                {
+                    container
+                        .Padding(25)
+                        .Grid(grid =>
+                        {
+                            grid.Columns(10);
+                            
+                            for(var i=1; i<=4; i++)
+                            {
+                                grid.Item(2).LabelCell(Placeholders.Label());
+                                grid.Item(3).ValueCell().Image(Placeholders.Image(200, 150));
+                            }
+                        });
+                });
+        }
     }
 }

QuestPDF.Examples/FrameExample.cs

@@ -12,11 +12,11 @@ namespace QuestPDF.Examples
         {
             return container
                 .Border(1)
-                .Background(dark ? "#EEE" : "#FFF")
+                .Background(dark ? Colors.Grey.Lighten2 : Colors.White)
                 .Padding(10);
         }
         
-        public static IContainer LabelCell(this IContainer container) => container.Cell(true);
+        public static void LabelCell(this IContainer container, string text) => container.Cell(true).Text(text, TextStyle.Default.Medium());
         public static IContainer ValueCell(this IContainer container) => container.Cell(false);
     }
     
@@ -40,7 +40,7 @@ namespace QuestPDF.Examples
                             {
                                 stack.Item().Row(row =>
                                 {
-                                    row.RelativeColumn(2).LabelCell().Text(Placeholders.Label());
+                                    row.RelativeColumn(2).LabelCell(Placeholders.Label());
                                     row.RelativeColumn(3).ValueCell().Text(Placeholders.Paragraph());
                                 });
                             }

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>

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)

QuestPDF/QuestPDF.csproj

@@ -4,9 +4,9 @@
         <Authors>MarcinZiabek</Authors>
         <Company>CodeFlint</Company>
         <PackageId>QuestPDF</PackageId>
-        <Version>2021.8</Version>
+        <Version>2021.9.0</Version>
         <PackageDescription>QuestPDF is an open-source, modern and battle-tested library that can help you with generating PDF documents by offering friendly, discoverable and predictable C# fluent API.</PackageDescription>
-        <PackageReleaseNotes>New elements: Unconstrained, Scale, ScaleHorizontal, ScaleVertical, FlipOver, FlipHorizontal, FlipVertical, Rotate, RotateLeft, RotateRight, TranslateX, TranslateY. Added support for more placeholders in the PageNumber element (current page, total number of pages, page number of any predefined location). Added support for documents with various page sizes. Various API improvements.</PackageReleaseNotes>
+        <PackageReleaseNotes>Added support for registering custom fonts from a stream.</PackageReleaseNotes>
         <LangVersion>8</LangVersion>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <PackageIcon>Logo.png</PackageIcon>
@@ -14,8 +14,8 @@
         <PackageProjectUrl>https://www.questpdf.com/</PackageProjectUrl>
         <RepositoryUrl>https://github.com/QuestPDF/library.git</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
-        <Copyright>QuestPDF contributors</Copyright>
-        <PackageTags>PDF file export generate create render portable document format quest free</PackageTags>
+        <Copyright>Marcin Ziąbek, QuestPDF contributors</Copyright>
+        <PackageTags>pdf file export generate generation tool create creation render portable document format quest html library converter free</PackageTags>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <Nullable>enable</Nullable>
         <TargetFrameworks>net462;netstandard2.0;netcoreapp2.0;netcoreapp3.0</TargetFrameworks>