Update PDFsharp to 6.2.3

Author: eXpl0it3r

Source/HtmlRenderer.PdfSharp/Adapters/PdfSharpAdapter.cs

@@ -12,9 +12,9 @@
 
 using PdfSharp.Drawing;
 using PdfSharp.Pdf;
-using System.Drawing;
-using System.Drawing.Text;
+using System;
 using System.IO;
+using FontResolver.PdfSharp;
 using TheArtOfDev.HtmlRenderer.Adapters;
 using TheArtOfDev.HtmlRenderer.Adapters.Entities;
 using TheArtOfDev.HtmlRenderer.PdfSharp.Utilities;
@@ -41,14 +41,16 @@ internal sealed class PdfSharpAdapter : RAdapter
         /// </summary>
         private PdfSharpAdapter()
         {
+            FontResolverPdfSharp.Register();
+
             AddFontFamilyMapping("monospace", "Courier New");
             AddFontFamilyMapping("Helvetica", "Arial");
 
-            var families = new InstalledFontCollection();
-
-            foreach (var family in families.Families)
+            var fontFamilies = FontResolver.FontResolver.DiscoverFontFamilies();
+            
+            foreach (var fontFamily in fontFamilies)
             {
-                AddFontFamily(new FontFamilyAdapter(new XFontFamily(family.Name)));
+                AddFontFamily(new FontFamilyAdapter(new XFontFamily(fontFamily)));
             }
         }
 
@@ -64,8 +66,23 @@ protected override RColor GetColorInt(string colorName)
         {
             try
             {
-                var color = Color.FromKnownColor((KnownColor)System.Enum.Parse(typeof(KnownColor), colorName, true));
-                return Utils.Convert(color);
+                var colorResourceManager = new XColorResourceManager();
+
+                var knownColors = XColorResourceManager.GetKnownColors(true);
+
+                foreach (var knownColor in knownColors)
+                {
+                    var name = colorResourceManager.ToColorName(knownColor);
+                    if (!string.Equals(name, colorName, StringComparison.OrdinalIgnoreCase))
+                    {
+                        continue;
+                    }
+
+                    var xColor = XColor.FromKnownColor(knownColor);
+                    return xColor.IsEmpty ? RColor.Empty : Utils.Convert(xColor);
+                }
+
+                return RColor.Empty;
             }
             catch
             {
@@ -119,14 +136,14 @@ protected override RImage ImageFromStreamInt(Stream memoryStream)
 
         protected override RFont CreateFontInt(string family, double size, RFontStyle style)
         {
-            var fontStyle = (XFontStyle)((int)style);
+            var fontStyle = Utils.Convert(style);
             var xFont = new XFont(family, size, fontStyle, new XPdfFontOptions(PdfFontEncoding.Unicode));
             return new FontAdapter(xFont);
         }
 
         protected override RFont CreateFontInt(RFontFamily family, double size, RFontStyle style)
         {
-            var fontStyle = (XFontStyle)((int)style);
+            var fontStyle = Utils.Convert(style);
             var xFont = new XFont(((FontFamilyAdapter)family).FontFamily.Name, size, fontStyle, new XPdfFontOptions(PdfFontEncoding.Unicode));
             return new FontAdapter(xFont);
         }

Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <RootNamespace>TheArtOfDev.HtmlRenderer.PdfSharp</RootNamespace>
 	<UseWinForms>true</UseWinForms>
@@ -10,13 +10,13 @@
   <!-- NuGet Package Properties -->
   <PropertyGroup>
     <PackageId>HtmlRenderer.PdfSharp</PackageId>
-    <Title>HTML Renderer for PDF using PdfSharp</Title>
+    <Title>HTML Renderer for PDF using PDFsharp</Title>
     <PackageTags>html render renderer draw pdfsharp</PackageTags>
-    <Description>PDF document generator from HTML snippet, 100% managed (C#), High performance library using PdfSharp.
+    <Description>PDF document generator from HTML snippet, 100% managed (C#), High performance library using PDFsharp.
 
 Features and Benefits:
 ---
-* 100% managed code depends only on PdfSharp library, no ActiveX, no MSHTML.
+* 100% managed code depends only on the libraries PDFsharp and FontResolver.PdfSharp, no ActiveX, no MSHTML.
 * Extensive HTML 4.01 and CSS level 2 specifications support.
 * Support separating CSS from HTML by loading stylesheet code separately.
 * Handles "real world" malformed HTML, it doesn't have to be XHTML.
@@ -32,7 +32,7 @@ Features and Benefits:
     <ProjectReference Include="..\HtmlRenderer\HtmlRenderer.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="PDFsharp" Version="1.50.5147" />
-    <PackageReference Include="System.Drawing.Common" Version="10.0.1" />
+    <PackageReference Include="FontResolver.PdfSharp" Version="1.1.0" />
+    <PackageReference Include="PDFsharp" Version="6.2.3" />
   </ItemGroup>
 </Project>

Source/HtmlRenderer.PdfSharp/PdfGenerator.cs

@@ -171,13 +171,13 @@ public static void AddPdfPages(PdfDocument document, string html, PdfGenerateCon
                     while (scrollOffset > -container.ActualSize.Height)
                     {
                         var page = document.AddPage();
-                        page.Height = orgPageSize.Height;
-                        page.Width = orgPageSize.Width;
+                        page.Height = XUnit.FromPoint(orgPageSize.Height);
+                        page.Width = XUnit.FromPoint(orgPageSize.Width);
 
                         using (var g = XGraphics.FromPdfPage(page))
                         {
                             //g.IntersectClip(new XRect(config.MarginLeft, config.MarginTop, pageSize.Width, pageSize.Height));
-                            g.IntersectClip(new XRect(0, 0, page.Width, page.Height));
+                            g.IntersectClip(new XRect(0, 0, page.Width.Point, page.Height.Point));
 
                             container.ScrollOffset = new XPoint(0, scrollOffset);
                             container.PerformPaint(g);

Source/HtmlRenderer.PdfSharp/Utilities/FontFamilyCollection.cs

@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace TheArtOfDev.HtmlRenderer.PdfSharp.Utilities
+{
+    internal class FontFamilyCollection
+    {
+    }
+}

Source/HtmlRenderer.PdfSharp/Utilities/Utils.cs

@@ -11,7 +11,6 @@
 // "The Art of War"
 
 using PdfSharp.Drawing;
-using System.Drawing;
 using TheArtOfDev.HtmlRenderer.Adapters.Entities;
 
 namespace TheArtOfDev.HtmlRenderer.PdfSharp.Utilities
@@ -89,11 +88,33 @@ public static XColor Convert(RColor c)
         }
 
         /// <summary>
-        /// Convert from  color to WinForms color.
+        /// Convert from PDFsharp color to WinForms color.
         /// </summary>
-        public static RColor Convert(Color c)
+        public static RColor Convert(XColor c)
         {
-            return RColor.FromArgb(c.A, c.R, c.G, c.B);
+            return RColor.FromArgb((byte)(c.A * 255.0), c.R, c.G, c.B);
+        }
+
+        /// <summary>
+        /// Convert from core font style to PDFsharp font style.
+        /// </summary>
+        public static XFontStyleEx Convert(RFontStyle style)
+        {
+            var fontStyle = XFontStyleEx.Regular;
+
+            if ((style & RFontStyle.Bold) == RFontStyle.Bold)
+                fontStyle |= XFontStyleEx.Bold;
+
+            if ((style & RFontStyle.Italic) == RFontStyle.Italic)
+                fontStyle |= XFontStyleEx.Italic;
+
+            if ((style & RFontStyle.Underline) == RFontStyle.Underline)
+                fontStyle |= XFontStyleEx.Underline;
+
+            if ((style & RFontStyle.Strikeout) == RFontStyle.Strikeout)
+                fontStyle |= XFontStyleEx.Strikeout;
+
+            return fontStyle;
         }
 
     }