Merge pull request #41 from ncfe-dev/master

Paging support in PDF added

Author: ArthurHub

Source/Demo/Common/HtmlRenderer.Demo.Common.csproj

@@ -155,6 +155,18 @@
   <ItemGroup>
     <EmbeddedResource Include="Resources\image32.png" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestSamples\32.Image in css content.htm" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestSamples\33.Fixed position.htm" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestSamples\34.Breaking pages 1 - Paragraphs.htm" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestSamples\35.Breaking pages 2 - Tables.htm" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Source/Demo/Common/TestSamples/32.Image in css content.htm

@@ -63,11 +63,13 @@
     <ApplicationIcon>html.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="PdfSharp">
-      <HintPath>..\..\packages\PDFsharp.1.32.3057.0\lib\net20\PdfSharp.dll</HintPath>
+    <Reference Include="PdfSharp, Version=1.50.4000.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\PDFsharp.1.50.4000-beta3b\lib\net20\PdfSharp.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="PdfSharp.Charting">
-      <HintPath>..\..\packages\PDFsharp.1.32.3057.0\lib\net20\PdfSharp.Charting.dll</HintPath>
+    <Reference Include="PdfSharp.Charting, Version=1.50.4000.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\PDFsharp.1.50.4000-beta3b\lib\net20\PdfSharp.Charting.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />

Source/Demo/Common/TestSamples/33.Fixed position.htm

@@ -10,13 +10,14 @@
 // - Sun Tsu,
 // "The Art of War"
 
+using PdfSharp.Drawing;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
+using System.IO;
 using System.Threading;
 using TheArtOfDev.HtmlRenderer.Core.Entities;
 using TheArtOfDev.HtmlRenderer.Demo.Common;
-using PdfSharp.Drawing;
 
 namespace TheArtOfDev.HtmlRenderer.Demo.WinForms
 {
@@ -79,7 +80,18 @@ public static Image TryLoadResourceImage(string src)
         public static XImage TryLoadResourceXImage(string src)
         {
             var img = TryLoadResourceImage(src);
-            return img != null ? XImage.FromGdiPlusImage(img) : null;
+            XImage xImg;
+
+            if (img == null)
+                return null;
+
+            using (var ms = new MemoryStream())
+            {
+                img.Save(ms, img.RawFormat);
+                xImg = img != null ? XImage.FromStream(ms) : null;
+            }
+
+            return xImg;
         }
 
         /// <summary>
@@ -104,7 +116,17 @@ public static void OnImageLoadPdfSharp(object sender, HtmlImageLoadEventArgs e)
         public static void ImageLoad(HtmlImageLoadEventArgs e, bool pdfSharp)
         {
             var img = TryLoadResourceImage(e.Src);
-            var xImg = img != null ? XImage.FromGdiPlusImage(img) : null;
+            XImage xImg = null;
+
+            if (img != null)
+            {
+                using (var ms = new MemoryStream())
+                {
+                    img.Save(ms, img.RawFormat);
+                    xImg = img != null ? XImage.FromStream(ms) : null;
+                }
+            }
+
             object imgObj;
             if (pdfSharp)
                 imgObj = xImg;

Source/Demo/Common/TestSamples/34.Breaking pages 1 - Paragraphs.htm

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="PDFsharp" version="1.32.3057.0" targetFramework="net40-Client" />
+  <package id="PDFsharp" version="1.50.4000-beta3b" targetFramework="net20" />
 </packages>

Source/Demo/Common/TestSamples/35.Breaking pages 2 - Tables.htm

@@ -10,12 +10,12 @@
 // - Sun Tsu,
 // "The Art of War"
 
+using PdfSharp.Drawing;
 using System;
 using TheArtOfDev.HtmlRenderer.Adapters;
 using TheArtOfDev.HtmlRenderer.Adapters.Entities;
 using TheArtOfDev.HtmlRenderer.Core.Utils;
 using TheArtOfDev.HtmlRenderer.PdfSharp.Utilities;
-using PdfSharp.Drawing;
 
 namespace TheArtOfDev.HtmlRenderer.PdfSharp.Adapters
 {
@@ -49,7 +49,6 @@ static GraphicsAdapter()
             _stringFormat = new XStringFormat();
             _stringFormat.Alignment = XStringAlignment.Near;
             _stringFormat.LineAlignment = XLineAlignment.Near;
-            _stringFormat.FormatFlags = XStringFormatFlags.MeasureTrailingSpaces;
         }
 
         /// <summary>

Source/Demo/WinForms/HtmlRenderer.Demo.WinForms.csproj

@@ -10,13 +10,14 @@
 // - Sun Tsu,
 // "The Art of War"
 
+using PdfSharp.Drawing;
+using PdfSharp.Pdf;
 using System.Drawing;
+using System.Drawing.Text;
 using System.IO;
 using TheArtOfDev.HtmlRenderer.Adapters;
 using TheArtOfDev.HtmlRenderer.Adapters.Entities;
 using TheArtOfDev.HtmlRenderer.PdfSharp.Utilities;
-using PdfSharp.Drawing;
-using PdfSharp.Pdf;
 
 namespace TheArtOfDev.HtmlRenderer.PdfSharp.Adapters
 {
@@ -43,9 +44,11 @@ private PdfSharpAdapter()
             AddFontFamilyMapping("monospace", "Courier New");
             AddFontFamilyMapping("Helvetica", "Arial");
 
-            foreach (var family in XFontFamily.Families)
+            var families = new InstalledFontCollection();
+
+            foreach (var family in families.Families)
             {
-                AddFontFamily(new FontFamilyAdapter(family));
+                AddFontFamily(new FontFamilyAdapter(new XFontFamily(family.Name)));
             }
         }
 
@@ -59,7 +62,15 @@ public static PdfSharpAdapter Instance
 
         protected override RColor GetColorInt(string colorName)
         {
-            return Utils.Convert(XColor.FromName(colorName));
+            try
+            {
+                var color = Color.FromKnownColor((KnownColor)System.Enum.Parse(typeof(KnownColor), colorName, true));
+                return Utils.Convert(color);
+            }
+            catch
+            {
+                return RColor.Empty;
+            }
         }
 
         protected override RPen CreatePen(RColor color)
@@ -103,7 +114,7 @@ protected override RImage ConvertImageInt(object image)
 
         protected override RImage ImageFromStreamInt(Stream memoryStream)
         {
-            return new ImageAdapter(XImage.FromGdiPlusImage(Image.FromStream(memoryStream)));
+            return new ImageAdapter(XImage.FromStream(memoryStream));
         }
 
         protected override RFont CreateFontInt(string family, double size, RFontStyle style)