From 57cd0b39819e41a42bb621630e4d58bae7399a8c Mon Sep 17 00:00:00 2001
From: slagou <slagou@github.com>
Date: Mon, 1 Feb 2016 15:36:04 -0500
Subject: [PATCH 01/10] Converted solution and project files to VS2013

Converted projects and solution to build under VS2013
Still using .net v2
---
 .../HtmlRenderer.PdfSharp.csproj              | 41 ++++++---
 Source/HtmlRenderer.sln                       | 53 +++++-------
 Source/HtmlRenderer/HtmlRenderer.csproj       | 83 +++++++++++--------
 3 files changed, 99 insertions(+), 78 deletions(-)

diff --git a/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj b/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj
index c3a449718..7fd3b038d 100644
--- a/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj
+++ b/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{CA249F5D-9285-40A6-B217-5889EF79FD7E}</ProjectGuid>
+    <ProjectGuid>{21A77A4B-2FF8-4ACF-BD1D-E7E7515147E7}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>TheArtOfDev.HtmlRenderer.PdfSharp</RootNamespace>
+    <RootNamespace>HtmlRenderer.PdfSharp</RootNamespace>
     <AssemblyName>HtmlRenderer.PdfSharp</AssemblyName>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
@@ -31,12 +32,27 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
   <ItemGroup>
-    <Reference Include="PdfSharp">
+    <Reference Include="PdfSharp, Version=1.32.3057.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
       <HintPath>..\packages\PDFsharp.1.32.3057.0\lib\net20\PdfSharp.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="PdfSharp.Charting">
+    <Reference Include="PdfSharp.Charting, Version=1.32.3057.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
       <HintPath>..\packages\PDFsharp.1.32.3057.0\lib\net20\PdfSharp.Charting.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -44,33 +60,32 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
     <Compile Include="Adapters\BrushAdapter.cs" />
     <Compile Include="Adapters\FontAdapter.cs" />
     <Compile Include="Adapters\FontFamilyAdapter.cs" />
     <Compile Include="Adapters\GraphicsAdapter.cs" />
     <Compile Include="Adapters\GraphicsPathAdapter.cs" />
     <Compile Include="Adapters\ImageAdapter.cs" />
+    <Compile Include="Adapters\PdfSharpAdapter.cs" />
     <Compile Include="Adapters\PenAdapter.cs" />
     <Compile Include="Adapters\XTextureBrush.cs" />
-    <Compile Include="PdfGenerateConfig.cs" />
     <Compile Include="HtmlContainer.cs" />
+    <Compile Include="PdfGenerateConfig.cs" />
     <Compile Include="PdfGenerator.cs" />
-    <Compile Include="Adapters\PdfSharpAdapter.cs" />
     <Compile Include="Utilities\Utils.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\HtmlRenderer\HtmlRenderer.csproj">
-      <Project>{fe611685-391f-4e3e-b27e-d3150e51e49b}</Project>
-      <Name>HtmlRenderer</Name>
+      <Project>{b1d0ecb6-3d40-4f6b-a59b-5370ede51946}</Project>
+      <Name>HtmlRenderer-VS2013</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
diff --git a/Source/HtmlRenderer.sln b/Source/HtmlRenderer.sln
index cf7aaa634..6ff2e996a 100644
--- a/Source/HtmlRenderer.sln
+++ b/Source/HtmlRenderer.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.30501.0
+VisualStudioVersion = 12.0.40629.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demo", "Demo", "{E263EA16-2E6A-4269-A319-AA2F97ADA8E1}"
 EndProject
@@ -15,16 +15,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HtmlRenderer.WinForms", "Ht
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HtmlRenderer.WPF", "HtmlRenderer.WPF\HtmlRenderer.WPF.csproj", "{7E4E8DB5-85AD-4388-BDCB-38C6F423B8B0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HtmlRenderer", "HtmlRenderer\HtmlRenderer.csproj", "{FE611685-391F-4E3E-B27E-D3150E51E49B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HtmlRenderer", "HtmlRenderer\HtmlRenderer.csproj", "{B1D0ECB6-3D40-4F6B-A59B-5370EDE51946}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HtmlRenderer.PdfSharp", "HtmlRenderer.PdfSharp\HtmlRenderer.PdfSharp.csproj", "{CA249F5D-9285-40A6-B217-5889EF79FD7E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{AA47D163-2ECF-45FB-8798-2432681396B5}"
-	ProjectSection(SolutionItems) = preProject
-		.nuget\NuGet.Config = .nuget\NuGet.Config
-		.nuget\NuGet.exe = .nuget\NuGet.exe
-		.nuget\NuGet.targets = .nuget\NuGet.targets
-	EndProjectSection
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HtmlRenderer.PdfSharp", "HtmlRenderer.PdfSharp\HtmlRenderer.PdfSharp.csproj", "{21A77A4B-2FF8-4ACF-BD1D-E7E7515147E7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -86,26 +79,26 @@ Global
 		{7E4E8DB5-85AD-4388-BDCB-38C6F423B8B0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7E4E8DB5-85AD-4388-BDCB-38C6F423B8B0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7E4E8DB5-85AD-4388-BDCB-38C6F423B8B0}.Release|x86.ActiveCfg = Release|Any CPU
-		{FE611685-391F-4E3E-B27E-D3150E51E49B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FE611685-391F-4E3E-B27E-D3150E51E49B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FE611685-391F-4E3E-B27E-D3150E51E49B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FE611685-391F-4E3E-B27E-D3150E51E49B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FE611685-391F-4E3E-B27E-D3150E51E49B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FE611685-391F-4E3E-B27E-D3150E51E49B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FE611685-391F-4E3E-B27E-D3150E51E49B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FE611685-391F-4E3E-B27E-D3150E51E49B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{FE611685-391F-4E3E-B27E-D3150E51E49B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{FE611685-391F-4E3E-B27E-D3150E51E49B}.Release|x86.ActiveCfg = Release|Any CPU
-		{CA249F5D-9285-40A6-B217-5889EF79FD7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CA249F5D-9285-40A6-B217-5889EF79FD7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CA249F5D-9285-40A6-B217-5889EF79FD7E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CA249F5D-9285-40A6-B217-5889EF79FD7E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CA249F5D-9285-40A6-B217-5889EF79FD7E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CA249F5D-9285-40A6-B217-5889EF79FD7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CA249F5D-9285-40A6-B217-5889EF79FD7E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CA249F5D-9285-40A6-B217-5889EF79FD7E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{CA249F5D-9285-40A6-B217-5889EF79FD7E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{CA249F5D-9285-40A6-B217-5889EF79FD7E}.Release|x86.ActiveCfg = Release|Any CPU
+		{B1D0ECB6-3D40-4F6B-A59B-5370EDE51946}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1D0ECB6-3D40-4F6B-A59B-5370EDE51946}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1D0ECB6-3D40-4F6B-A59B-5370EDE51946}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B1D0ECB6-3D40-4F6B-A59B-5370EDE51946}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B1D0ECB6-3D40-4F6B-A59B-5370EDE51946}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B1D0ECB6-3D40-4F6B-A59B-5370EDE51946}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1D0ECB6-3D40-4F6B-A59B-5370EDE51946}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1D0ECB6-3D40-4F6B-A59B-5370EDE51946}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{B1D0ECB6-3D40-4F6B-A59B-5370EDE51946}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{B1D0ECB6-3D40-4F6B-A59B-5370EDE51946}.Release|x86.ActiveCfg = Release|Any CPU
+		{21A77A4B-2FF8-4ACF-BD1D-E7E7515147E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21A77A4B-2FF8-4ACF-BD1D-E7E7515147E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21A77A4B-2FF8-4ACF-BD1D-E7E7515147E7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{21A77A4B-2FF8-4ACF-BD1D-E7E7515147E7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{21A77A4B-2FF8-4ACF-BD1D-E7E7515147E7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{21A77A4B-2FF8-4ACF-BD1D-E7E7515147E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{21A77A4B-2FF8-4ACF-BD1D-E7E7515147E7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{21A77A4B-2FF8-4ACF-BD1D-E7E7515147E7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{21A77A4B-2FF8-4ACF-BD1D-E7E7515147E7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{21A77A4B-2FF8-4ACF-BD1D-E7E7515147E7}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Source/HtmlRenderer/HtmlRenderer.csproj b/Source/HtmlRenderer/HtmlRenderer.csproj
index 74549b41d..f2e50f6f5 100644
--- a/Source/HtmlRenderer/HtmlRenderer.csproj
+++ b/Source/HtmlRenderer/HtmlRenderer.csproj
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{FE611685-391F-4E3E-B27E-D3150E51E49B}</ProjectGuid>
+    <ProjectGuid>{B1D0ECB6-3D40-4F6B-A59B-5370EDE51946}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>TheArtOfDev.HtmlRenderer</RootNamespace>
+    <RootNamespace>HtmlRenderer</RootNamespace>
     <AssemblyName>HtmlRenderer</AssemblyName>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -29,21 +30,46 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Core\Utils\ImageError.png" />
-    <EmbeddedResource Include="Core\Utils\ImageLoad.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
+    <Compile Include="Adapters\Entities\RColor.cs" />
+    <Compile Include="Adapters\Entities\RDashStyle.cs" />
+    <Compile Include="Adapters\Entities\RFontStyle.cs" />
+    <Compile Include="Adapters\Entities\RKeyEvent.cs" />
+    <Compile Include="Adapters\Entities\RMouseEvent.cs" />
+    <Compile Include="Adapters\Entities\RPoint.cs" />
+    <Compile Include="Adapters\Entities\RRect.cs" />
+    <Compile Include="Adapters\Entities\RSize.cs" />
+    <Compile Include="Adapters\RAdapter.cs" />
+    <Compile Include="Adapters\RBrush.cs" />
+    <Compile Include="Adapters\RContextMenu.cs" />
+    <Compile Include="Adapters\RControl.cs" />
+    <Compile Include="Adapters\RFont.cs" />
+    <Compile Include="Adapters\RFontFamily.cs" />
+    <Compile Include="Adapters\RGraphics.cs" />
+    <Compile Include="Adapters\RGraphicsPath.cs" />
+    <Compile Include="Adapters\RImage.cs" />
+    <Compile Include="Adapters\RPen.cs" />
+    <Compile Include="Core\CssData.cs" />
     <Compile Include="Core\CssDefaults.cs" />
+    <Compile Include="Core\Dom\Border.cs" />
     <Compile Include="Core\Dom\CssBox.cs" />
     <Compile Include="Core\Dom\CssBoxFrame.cs" />
     <Compile Include="Core\Dom\CssBoxHr.cs" />
@@ -60,7 +86,6 @@
     <Compile Include="Core\Dom\CssUnit.cs" />
     <Compile Include="Core\Dom\HoverBoxBlock.cs" />
     <Compile Include="Core\Dom\HtmlTag.cs" />
-    <Compile Include="Core\Dom\Border.cs" />
     <Compile Include="Core\Entities\CssBlock.cs" />
     <Compile Include="Core\Entities\CssBlockSelectorItem.cs" />
     <Compile Include="Core\Entities\HtmlGenerationStyle.cs" />
@@ -81,11 +106,13 @@
     <Compile Include="Core\Handlers\ImageLoadHandler.cs" />
     <Compile Include="Core\Handlers\SelectionHandler.cs" />
     <Compile Include="Core\Handlers\StylesheetLoadHandler.cs" />
+    <Compile Include="Core\HtmlContainerInt.cs" />
     <Compile Include="Core\HtmlRendererUtils.cs" />
     <Compile Include="Core\Parse\CssParser.cs" />
     <Compile Include="Core\Parse\CssValueParser.cs" />
     <Compile Include="Core\Parse\DomParser.cs" />
     <Compile Include="Core\Parse\HtmlParser.cs" />
+    <Compile Include="Core\Parse\RegexParserHelper.cs" />
     <Compile Include="Core\Parse\RegexParserUtils.cs" />
     <Compile Include="Core\Utils\ArgChecker.cs" />
     <Compile Include="Core\Utils\CommonUtils.cs" />
@@ -95,29 +122,15 @@
     <Compile Include="Core\Utils\HtmlConstants.cs" />
     <Compile Include="Core\Utils\HtmlUtils.cs" />
     <Compile Include="Core\Utils\RenderUtils.cs" />
-    <Compile Include="Core\HtmlContainerInt.cs" />
-    <Compile Include="Core\CssData.cs" />
-    <Compile Include="Adapters\Entities\RColor.cs" />
-    <Compile Include="Adapters\Entities\RDashStyle.cs" />
-    <Compile Include="Adapters\Entities\RFontStyle.cs" />
-    <Compile Include="Adapters\Entities\RKeyEvent.cs" />
-    <Compile Include="Adapters\Entities\RMouseEvent.cs" />
-    <Compile Include="Adapters\Entities\RPoint.cs" />
-    <Compile Include="Adapters\Entities\RRect.cs" />
-    <Compile Include="Adapters\Entities\RSize.cs" />
-    <Compile Include="Adapters\RAdapter.cs" />
-    <Compile Include="Adapters\RBrush.cs" />
-    <Compile Include="Adapters\RContextMenu.cs" />
-    <Compile Include="Adapters\RControl.cs" />
-    <Compile Include="Adapters\RFont.cs" />
-    <Compile Include="Adapters\RFontFamily.cs" />
-    <Compile Include="Adapters\RGraphics.cs" />
-    <Compile Include="Adapters\RGraphicsPath.cs" />
-    <Compile Include="Adapters\RImage.cs" />
-    <Compile Include="Adapters\RPen.cs" />
     <Compile Include="Core\Utils\SubString.cs" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Content Include="Core\Utils\ImageError.png" />
+    <Content Include="Core\Utils\ImageLoad.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </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.

From cf8ce9984d272a6a0ff9a2772e69cec2edd50db9 Mon Sep 17 00:00:00 2001
From: slagou <slagou@github.com>
Date: Mon, 1 Feb 2016 15:40:52 -0500
Subject: [PATCH 02/10] Removed link handlind due to bug

Temporarily removed due to bug.
---
 Source/HtmlRenderer.PdfSharp/PdfGenerator.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Source/HtmlRenderer.PdfSharp/PdfGenerator.cs b/Source/HtmlRenderer.PdfSharp/PdfGenerator.cs
index c8c167e05..174550f1f 100644
--- a/Source/HtmlRenderer.PdfSharp/PdfGenerator.cs
+++ b/Source/HtmlRenderer.PdfSharp/PdfGenerator.cs
@@ -179,8 +179,11 @@ public static void AddPdfPages(PdfDocument document, string html, PdfGenerateCon
                         scrollOffset -= pageSize.Height;
                     }
 
+                    // SL: Temporarily remove as it crashed on html links
+                    // TODO: update to allow non-processing based on config option. (or just fix it?)
+
                     // add web links and anchors
-                    HandleLinks(document, container, orgPageSize, pageSize);
+                    //HandleLinks(document, container, orgPageSize, pageSize);
                 }
             }
         }

From d09fcf149e09afc657b3ae743d672a237f639306 Mon Sep 17 00:00:00 2001
From: slagou <slagou@github.com>
Date: Mon, 1 Feb 2016 17:00:01 -0500
Subject: [PATCH 03/10] Updated with new references from nuget

Had to enable package restore on solution.
---
 .../HtmlRenderer.PdfSharp.csproj              | 38 +++++++++----------
 Source/HtmlRenderer/HtmlRenderer.csproj       |  2 +-
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj b/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj
index 7fd3b038d..d2d9faeeb 100644
--- a/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj
+++ b/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{21A77A4B-2FF8-4ACF-BD1D-E7E7515147E7}</ProjectGuid>
+    <ProjectGuid>{CA249F5D-9285-40A6-B217-5889EF79FD7E}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>HtmlRenderer.PdfSharp</RootNamespace>
@@ -45,20 +45,6 @@
     <OutputPath>bin\x86\Release\</OutputPath>
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="PdfSharp, Version=1.32.3057.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\PDFsharp.1.32.3057.0\lib\net20\PdfSharp.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="PdfSharp.Charting, Version=1.32.3057.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\PDFsharp.1.32.3057.0\lib\net20\PdfSharp.Charting.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="Adapters\BrushAdapter.cs" />
     <Compile Include="Adapters\FontAdapter.cs" />
@@ -76,15 +62,29 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\HtmlRenderer\HtmlRenderer.csproj">
-      <Project>{b1d0ecb6-3d40-4f6b-a59b-5370ede51946}</Project>
-      <Name>HtmlRenderer-VS2013</Name>
+      <Project>{FE611685-391F-4E3E-B27E-D3150E51E49B}</Project>
+      <Name>HtmlRenderer</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\" />
+    <Reference Include="PdfSharp, Version=1.32.3057.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\PDFsharp.1.32.3057.0\lib\net20\PdfSharp.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="PdfSharp.Charting, Version=1.32.3057.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\PDFsharp.1.32.3057.0\lib\net20\PdfSharp.Charting.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System">
+      <HintPath>C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Drawing" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
diff --git a/Source/HtmlRenderer/HtmlRenderer.csproj b/Source/HtmlRenderer/HtmlRenderer.csproj
index f2e50f6f5..1fa0da034 100644
--- a/Source/HtmlRenderer/HtmlRenderer.csproj
+++ b/Source/HtmlRenderer/HtmlRenderer.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{B1D0ECB6-3D40-4F6B-A59B-5370EDE51946}</ProjectGuid>
+    <ProjectGuid>{FE611685-391F-4E3E-B27E-D3150E51E49B}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>HtmlRenderer</RootNamespace>

From 1eaf4ca496681c9ae08dbfc971b78f6ff7397545 Mon Sep 17 00:00:00 2001
From: slagou <slagou@github.com>
Date: Tue, 2 Feb 2016 15:04:02 -0500
Subject: [PATCH 04/10] Added bool for link handling to config class

Bool property added to config class that is respected in pdf generation
code.
---
 Source/HtmlRenderer.PdfSharp/PdfGenerateConfig.cs |  6 ++++++
 Source/HtmlRenderer.PdfSharp/PdfGenerator.cs      | 10 +++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Source/HtmlRenderer.PdfSharp/PdfGenerateConfig.cs b/Source/HtmlRenderer.PdfSharp/PdfGenerateConfig.cs
index b0aa0d64c..8f22d8cc5 100644
--- a/Source/HtmlRenderer.PdfSharp/PdfGenerateConfig.cs
+++ b/Source/HtmlRenderer.PdfSharp/PdfGenerateConfig.cs
@@ -138,6 +138,12 @@ public int MarginRight
             }
         }
 
+        /// <summary>
+        /// Sets weather to Handle HTML links by create PDF 
+        /// Documents link either to external URL or to another page in the document
+        /// </summary>
+        public bool HandleLinks { get; set; }
+
         /// <summary>
         /// Set all 4 margins to the given value.
         /// </summary>
diff --git a/Source/HtmlRenderer.PdfSharp/PdfGenerator.cs b/Source/HtmlRenderer.PdfSharp/PdfGenerator.cs
index 174550f1f..db6b7d9a8 100644
--- a/Source/HtmlRenderer.PdfSharp/PdfGenerator.cs
+++ b/Source/HtmlRenderer.PdfSharp/PdfGenerator.cs
@@ -179,11 +179,11 @@ public static void AddPdfPages(PdfDocument document, string html, PdfGenerateCon
                         scrollOffset -= pageSize.Height;
                     }
 
-                    // SL: Temporarily remove as it crashed on html links
-                    // TODO: update to allow non-processing based on config option. (or just fix it?)
-
-                    // add web links and anchors
-                    //HandleLinks(document, container, orgPageSize, pageSize);
+                    // SL: Set config option to handle links or not as it crashes for 
+                    // some valid html links. 
+                    // TODO: Investigate reason for crashing. 
+                    if (config.HandleLinks)
+                        HandleLinks(document, container, orgPageSize, pageSize);
                 }
             }
         }

From f615b8822d425db056905355b76d247d80ad5f5a Mon Sep 17 00:00:00 2001
From: slagou <steven.lagou@oneviewcommerce.com>
Date: Fri, 29 Apr 2016 15:55:18 -0400
Subject: [PATCH 05/10] project update

---
 .../HtmlRenderer.PdfSharp.csproj                | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj b/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj
index db64c8e1b..bfd3a9bfe 100644
--- a/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj
+++ b/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj
@@ -47,11 +47,11 @@
   </PropertyGroup>
   <ItemGroup>
     <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>
+      <HintPath>..\..\..\..\POSClientInstaller\packages\PDFsharp.1.50.4000-beta3b\lib\net20\PdfSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <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>
+      <HintPath>..\..\..\..\POSClientInstaller\packages\PDFsharp.1.50.4000-beta3b\lib\net20\PdfSharp.Charting.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -84,25 +84,14 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="PdfSharp, Version=1.32.3057.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\PDFsharp.1.32.3057.0\lib\net20\PdfSharp.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="PdfSharp.Charting, Version=1.32.3057.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\PDFsharp.1.32.3057.0\lib\net20\PdfSharp.Charting.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System">
       <HintPath>C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.dll</HintPath>
     </Reference>
     <Reference Include="System.Drawing" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

From 2a142a9ac65b574c76022b4fd5a72b411f4ef4da Mon Sep 17 00:00:00 2001
From: slagou <steven.lagou@oneviewcommerce.com>
Date: Tue, 12 Jul 2016 21:34:02 -0400
Subject: [PATCH 06/10] Package update

---
 .../HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj b/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj
index bfd3a9bfe..7ee537fd2 100644
--- a/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj
+++ b/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj
@@ -47,11 +47,11 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="PdfSharp, Version=1.50.4000.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\POSClientInstaller\packages\PDFsharp.1.50.4000-beta3b\lib\net20\PdfSharp.dll</HintPath>
+      <HintPath>..\..\..\..\packages\PDFsharp.1.50.4000-beta3b\lib\net20\PdfSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="PdfSharp.Charting, Version=1.50.4000.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\POSClientInstaller\packages\PDFsharp.1.50.4000-beta3b\lib\net20\PdfSharp.Charting.dll</HintPath>
+      <HintPath>..\..\..\..\packages\PDFsharp.1.50.4000-beta3b\lib\net20\PdfSharp.Charting.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -83,15 +83,15 @@
       <Name>HtmlRenderer</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <Reference Include="System">
       <HintPath>C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.dll</HintPath>
     </Reference>
     <Reference Include="System.Drawing" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

From 2aa1b8a8af6a5c8f3fb8b6d7ae2e8e033a19bd7c Mon Sep 17 00:00:00 2001
From: slagou <steven.lagou@oneviewcommerce.com>
Date: Thu, 29 Sep 2016 01:26:04 -0400
Subject: [PATCH 07/10] Added optional Page number footer

Contolled via Config.  hard coded Page number footer for documents over 1
page.  Respects margrins.
---
 .../HtmlRenderer.PdfSharp.csproj              |  8 +--
 .../PdfGenerateConfig.cs                      |  7 +++
 Source/HtmlRenderer.PdfSharp/PdfGenerator.cs  | 49 ++++++++++++++++---
 Source/HtmlRenderer.PdfSharp/packages.config  |  2 +-
 4 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj b/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj
index 7ee537fd2..67a7ed1a0 100644
--- a/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj
+++ b/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj
@@ -46,12 +46,12 @@
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
-    <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>
+    <Reference Include="PdfSharp, Version=1.50.3994.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\PDFsharp.1.50.3994-beta3a\lib\net20\PdfSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <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>
+    <Reference Include="PdfSharp.Charting, Version=1.50.3994.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\PDFsharp.1.50.3994-beta3a\lib\net20\PdfSharp.Charting.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/Source/HtmlRenderer.PdfSharp/PdfGenerateConfig.cs b/Source/HtmlRenderer.PdfSharp/PdfGenerateConfig.cs
index 8f22d8cc5..fe54e818d 100644
--- a/Source/HtmlRenderer.PdfSharp/PdfGenerateConfig.cs
+++ b/Source/HtmlRenderer.PdfSharp/PdfGenerateConfig.cs
@@ -144,6 +144,13 @@ public int MarginRight
         /// </summary>
         public bool HandleLinks { get; set; }
 
+        /// <summary>
+        /// Add a page count footer to the PDF        
+        /// </summary>
+        public bool AddPageCountFoooter { get; set; }
+
+        
+
         /// <summary>
         /// Set all 4 margins to the given value.
         /// </summary>
diff --git a/Source/HtmlRenderer.PdfSharp/PdfGenerator.cs b/Source/HtmlRenderer.PdfSharp/PdfGenerator.cs
index 8f4c0b851..e30afffab 100644
--- a/Source/HtmlRenderer.PdfSharp/PdfGenerator.cs
+++ b/Source/HtmlRenderer.PdfSharp/PdfGenerator.cs
@@ -154,20 +154,21 @@ public static void AddPdfPages(PdfDocument document, string html, PdfGenerateCon
                     container.Location = new XPoint(config.MarginLeft, config.MarginTop);
                     container.MaxSize = new XSize(pageSize.Width, 0);
                     container.SetHtml(html, cssData);
-                    container.PageSize = pageSize;
-                    container.MarginBottom = config.MarginBottom;
+                    container.PageSize = pageSize;                    
+                    container.MarginBottom = config.MarginBottom;  
                     container.MarginLeft = config.MarginLeft;
                     container.MarginRight = config.MarginRight;
                     container.MarginTop = config.MarginTop;
 
                     // layout the HTML with the page width restriction to know how many pages are required
-                    using (var measure = XGraphics.CreateMeasureContext(pageSize, XGraphicsUnit.Point, XPageDirection.Downwards))
-                    {
-                        container.PerformLayout(measure);
-                    }
+                    var measure = XGraphics.CreateMeasureContext(pageSize, XGraphicsUnit.Point, XPageDirection.Downwards);              
+                    container.PerformLayout(measure);                    
 
                     // while there is un-rendered HTML, create another PDF page and render with proper offset for the next page
                     double scrollOffset = 0;
+                    //SL: if there is more than one page, increase the bottom margin to allow space for the page number
+                    container.MarginBottom += scrollOffset > -container.ActualSize.Height ?  20 : 0;
+                    container.PerformLayout(measure); //SL: This still does not increase the margin for the first page of a multi page.. welp
                     while (scrollOffset > -container.ActualSize.Height)
                     {
                         var page = document.AddPage();
@@ -185,6 +186,9 @@ public static void AddPdfPages(PdfDocument document, string html, PdfGenerateCon
                         scrollOffset -= pageSize.Height;
                     }
 
+                    if (config.AddPageCountFoooter && document.PageCount > 1)  //Only add page numbers if more than one page
+                        AddPageCountFoooter(document, pageSize);
+
                     // SL: Set config option to handle links or not as it crashes for 
                     // some valid html links. 
                     // TODO: Investigate reason for crashing. 
@@ -198,6 +202,37 @@ public static void AddPdfPages(PdfDocument document, string html, PdfGenerateCon
 
         #region Private/Protected methods
 
+        /// <summary>
+        /// Add a page count footer to the PDF
+        /// </summary>
+        /// <param name="document"></param>
+        /// <param name="container"></param>
+        /// <param name="orgPageSize"></param>
+        /// <param name="pageSize"></param>
+        private static void AddPageCountFoooter(PdfDocument document, XSize pageSize)
+        {
+            
+            // Make a font and a brush to draw the page counter.
+            XFont font = new XFont("Helvetica", 8);
+            XBrush brush = XBrushes.Black;
+
+            // Add the page counter.
+            string noPages = document.Pages.Count.ToString();
+            for (int i = 0; i < document.Pages.Count; ++i)
+            {
+                PdfPage page = document.Pages[i];
+                // Make a layout rectangle.
+                XRect layoutRectangle = new XRect(0/*X*/, page.Height - font.Height - 10/*Y*/, pageSize.Width/*Width*/, font.Height/*Height*/);
+                XGraphics gfx = XGraphics.FromPdfPage(page);
+                gfx.DrawString(
+                    "Page " + (i + 1).ToString() + " of " + noPages,
+                    font,
+                    brush,
+                    layoutRectangle,
+                    XStringFormats.CenterRight);
+            }
+        }
+
         /// <summary>
         /// Handle HTML links by create PDF Documents link either to external URL or to another page in the document.
         /// </summary>
@@ -222,7 +257,7 @@ private static void HandleLinks(PdfDocument document, HtmlContainer container, X
                             // document links to the same page as the link is not allowed
                             int anchorPageIdx = (int)(anchorRect.Value.Top / pageSize.Height);
                             if (i != anchorPageIdx)
-                                document.Pages[i].AddDocumentLink(new PdfRectangle(xRect), anchorPageIdx);
+                                document.Pages[i].AddDocumentLink(new PdfRectangle(xRect), anchorPageIdx);                            
                         }
                     }
                     else
diff --git a/Source/HtmlRenderer.PdfSharp/packages.config b/Source/HtmlRenderer.PdfSharp/packages.config
index 2f092fd78..f12e48bcd 100644
--- a/Source/HtmlRenderer.PdfSharp/packages.config
+++ b/Source/HtmlRenderer.PdfSharp/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="PDFsharp" version="1.50.4000-beta3b" targetFramework="net20" />
+  <package id="PDFsharp" version="1.50.3994-beta3a" targetFramework="net20" />
 </packages>
\ No newline at end of file

From 3497fb145f61a6f3883cd96a39a55c43e794bfec Mon Sep 17 00:00:00 2001
From: slagou <steven.lagou@oneviewcommerce.com>
Date: Tue, 31 Jan 2017 14:31:55 -0500
Subject: [PATCH 08/10] 64 bit build and PDFsharp update

---
 .../Common/HtmlRenderer.Demo.Common.csproj    | 18 ++++++++++
 Source/Demo/Common/Samples/02.Text.htm        | 10 +++---
 Source/Demo/Common/TestSamples/12.Text.htm    | 14 ++++----
 Source/Demo/Common/TestSamples/22.RTL.htm     | 34 +++++++++----------
 Source/Demo/WPF/HtmlRenderer.Demo.WPF.csproj  | 18 ++++++++++
 .../HtmlRenderer.Demo.WinForms.csproj         | 18 ++++++++++
 .../HtmlRenderer.PdfSharp.csproj              | 28 ++++++++++++---
 Source/HtmlRenderer.PdfSharp/packages.config  |  2 +-
 .../HtmlRenderer.WPF/HtmlRenderer.WPF.csproj  | 18 ++++++++++
 .../HtmlRenderer.WinForms.csproj              | 18 ++++++++++
 Source/HtmlRenderer.sln                       | 34 +++++++++++++++++--
 Source/HtmlRenderer/HtmlRenderer.csproj       | 20 ++++++++++-
 12 files changed, 194 insertions(+), 38 deletions(-)

diff --git a/Source/Demo/Common/HtmlRenderer.Demo.Common.csproj b/Source/Demo/Common/HtmlRenderer.Demo.Common.csproj
index 7413cc397..5d034a004 100644
--- a/Source/Demo/Common/HtmlRenderer.Demo.Common.csproj
+++ b/Source/Demo/Common/HtmlRenderer.Demo.Common.csproj
@@ -30,6 +30,24 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/Source/Demo/Common/Samples/02.Text.htm b/Source/Demo/Common/Samples/02.Text.htm
index b7aee3fa9..a54efc868 100644
--- a/Source/Demo/Common/Samples/02.Text.htm
+++ b/Source/Demo/Common/Samples/02.Text.htm
@@ -2,11 +2,11 @@
     <head>
         <title>Text</title>
         <link rel="Stylesheet" href="StyleSheet" />
-        <style type="text/css">
-            ::selection {
-                color: #bb5555;
-                background-color: #aaddaa;
-            }
+        <style type="text/css">
+            ::selection {
+                color: #bb5555;
+                background-color: #aaddaa;
+            }
         </style>
     </head>
     <body>
diff --git a/Source/Demo/Common/TestSamples/12.Text.htm b/Source/Demo/Common/TestSamples/12.Text.htm
index c53a43609..833196bae 100644
--- a/Source/Demo/Common/TestSamples/12.Text.htm
+++ b/Source/Demo/Common/TestSamples/12.Text.htm
@@ -2,13 +2,13 @@
     <head>
         <title>Text</title>
         <link rel="Stylesheet" href="StyleSheet" />
-        <style>
-            .right {
-                text-align: right;
-                border-width: 1px;
-                border-style: solid;
-                border-color: blue;
-            }
+        <style>
+            .right {
+                text-align: right;
+                border-width: 1px;
+                border-style: solid;
+                border-color: blue;
+            }
         </style>
     </head>
     <body>
diff --git a/Source/Demo/Common/TestSamples/22.RTL.htm b/Source/Demo/Common/TestSamples/22.RTL.htm
index 35bf9bf6c..a24d4f4e7 100644
--- a/Source/Demo/Common/TestSamples/22.RTL.htm
+++ b/Source/Demo/Common/TestSamples/22.RTL.htm
@@ -1,18 +1,18 @@
-<html>
-    <body>
-        <div dir="rtl">
-            <div>שלום עולם, יש <b>ברבורים </b>בעגם הזה</div>
-            <br />
-            <div>שלום עולם, יש ברבורים בעגם הזה</div>
-            <div>שלום עולם, יש ברבורים בעגם הזה</div>
-        </div>
-        <hr />
-        <div dir="rtl">
-            <div>שלום עולם,<span>hello world</span> יש ברבורים בעגם הזה</div>
-            <br />
-            <div>שלום עולם, יש ברבורים בעגם הזה</div>
-            <div>שלום עולם, יש ברבורים בעגם הזה</div>
-        </div>
-        <hr />
-    </body>
+<html>
+    <body>
+        <div dir="rtl">
+            <div>שלום עולם, יש <b>ברבורים </b>בעגם הזה</div>
+            <br />
+            <div>שלום עולם, יש ברבורים בעגם הזה</div>
+            <div>שלום עולם, יש ברבורים בעגם הזה</div>
+        </div>
+        <hr />
+        <div dir="rtl">
+            <div>שלום עולם,<span>hello world</span> יש ברבורים בעגם הזה</div>
+            <br />
+            <div>שלום עולם, יש ברבורים בעגם הזה</div>
+            <div>שלום עולם, יש ברבורים בעגם הזה</div>
+        </div>
+        <hr />
+    </body>
 </html>
\ No newline at end of file
diff --git a/Source/Demo/WPF/HtmlRenderer.Demo.WPF.csproj b/Source/Demo/WPF/HtmlRenderer.Demo.WPF.csproj
index 8c26cdcc4..0d8a8822d 100644
--- a/Source/Demo/WPF/HtmlRenderer.Demo.WPF.csproj
+++ b/Source/Demo/WPF/HtmlRenderer.Demo.WPF.csproj
@@ -39,6 +39,24 @@
   <PropertyGroup>
     <ApplicationIcon>html.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/Source/Demo/WinForms/HtmlRenderer.Demo.WinForms.csproj b/Source/Demo/WinForms/HtmlRenderer.Demo.WinForms.csproj
index 95dafc2f1..f62f6fcbb 100644
--- a/Source/Demo/WinForms/HtmlRenderer.Demo.WinForms.csproj
+++ b/Source/Demo/WinForms/HtmlRenderer.Demo.WinForms.csproj
@@ -62,6 +62,24 @@
   <PropertyGroup>
     <ApplicationIcon>html.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <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>
diff --git a/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj b/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj
index 67a7ed1a0..eebcac1dd 100644
--- a/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj
+++ b/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{CA249F5D-9285-40A6-B217-5889EF79FD7E}</ProjectGuid>
+    <ProjectGuid>{21A77A4B-2FF8-4ACF-BD1D-E7E7515147E7}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>HtmlRenderer.PdfSharp</RootNamespace>
@@ -45,13 +45,31 @@
     <OutputPath>bin\x86\Release\</OutputPath>
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
-    <Reference Include="PdfSharp, Version=1.50.3994.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\PDFsharp.1.50.3994-beta3a\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, Version=1.50.3994.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\PDFsharp.1.50.3994-beta3a\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" />
diff --git a/Source/HtmlRenderer.PdfSharp/packages.config b/Source/HtmlRenderer.PdfSharp/packages.config
index f12e48bcd..2f092fd78 100644
--- a/Source/HtmlRenderer.PdfSharp/packages.config
+++ b/Source/HtmlRenderer.PdfSharp/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="PDFsharp" version="1.50.3994-beta3a" targetFramework="net20" />
+  <package id="PDFsharp" version="1.50.4000-beta3b" targetFramework="net20" />
 </packages>
\ No newline at end of file
diff --git a/Source/HtmlRenderer.WPF/HtmlRenderer.WPF.csproj b/Source/HtmlRenderer.WPF/HtmlRenderer.WPF.csproj
index 5c725a851..60adc69ba 100644
--- a/Source/HtmlRenderer.WPF/HtmlRenderer.WPF.csproj
+++ b/Source/HtmlRenderer.WPF/HtmlRenderer.WPF.csproj
@@ -33,6 +33,24 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/Source/HtmlRenderer.WinForms/HtmlRenderer.WinForms.csproj b/Source/HtmlRenderer.WinForms/HtmlRenderer.WinForms.csproj
index ce1a98759..6853c450a 100644
--- a/Source/HtmlRenderer.WinForms/HtmlRenderer.WinForms.csproj
+++ b/Source/HtmlRenderer.WinForms/HtmlRenderer.WinForms.csproj
@@ -56,6 +56,24 @@
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/Source/HtmlRenderer.sln b/Source/HtmlRenderer.sln
index 6ff2e996a..746a407af 100644
--- a/Source/HtmlRenderer.sln
+++ b/Source/HtmlRenderer.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.40629.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demo", "Demo", "{E263EA16-2E6A-4269-A319-AA2F97ADA8E1}"
 EndProject
@@ -23,9 +23,11 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
 		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
@@ -33,71 +35,99 @@ Global
 		{2390B71F-9400-47F4-B23A-7F2649C87D35}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2390B71F-9400-47F4-B23A-7F2649C87D35}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{2390B71F-9400-47F4-B23A-7F2649C87D35}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2390B71F-9400-47F4-B23A-7F2649C87D35}.Debug|x64.ActiveCfg = Debug|x64
+		{2390B71F-9400-47F4-B23A-7F2649C87D35}.Debug|x64.Build.0 = Debug|x64
 		{2390B71F-9400-47F4-B23A-7F2649C87D35}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{2390B71F-9400-47F4-B23A-7F2649C87D35}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2390B71F-9400-47F4-B23A-7F2649C87D35}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2390B71F-9400-47F4-B23A-7F2649C87D35}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2390B71F-9400-47F4-B23A-7F2649C87D35}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{2390B71F-9400-47F4-B23A-7F2649C87D35}.Release|x64.ActiveCfg = Release|x64
+		{2390B71F-9400-47F4-B23A-7F2649C87D35}.Release|x64.Build.0 = Release|x64
 		{2390B71F-9400-47F4-B23A-7F2649C87D35}.Release|x86.ActiveCfg = Release|Any CPU
 		{8AD34FE8-8382-4A8A-B3AA-A0392ED42423}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8AD34FE8-8382-4A8A-B3AA-A0392ED42423}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8AD34FE8-8382-4A8A-B3AA-A0392ED42423}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{8AD34FE8-8382-4A8A-B3AA-A0392ED42423}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8AD34FE8-8382-4A8A-B3AA-A0392ED42423}.Debug|x64.ActiveCfg = Debug|x64
+		{8AD34FE8-8382-4A8A-B3AA-A0392ED42423}.Debug|x64.Build.0 = Debug|x64
 		{8AD34FE8-8382-4A8A-B3AA-A0392ED42423}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{8AD34FE8-8382-4A8A-B3AA-A0392ED42423}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8AD34FE8-8382-4A8A-B3AA-A0392ED42423}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8AD34FE8-8382-4A8A-B3AA-A0392ED42423}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8AD34FE8-8382-4A8A-B3AA-A0392ED42423}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{8AD34FE8-8382-4A8A-B3AA-A0392ED42423}.Release|x64.ActiveCfg = Release|x64
+		{8AD34FE8-8382-4A8A-B3AA-A0392ED42423}.Release|x64.Build.0 = Release|x64
 		{8AD34FE8-8382-4A8A-B3AA-A0392ED42423}.Release|x86.ActiveCfg = Release|Any CPU
 		{F02E0216-4AE3-474F-9381-FCB93411CDB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F02E0216-4AE3-474F-9381-FCB93411CDB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F02E0216-4AE3-474F-9381-FCB93411CDB0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{F02E0216-4AE3-474F-9381-FCB93411CDB0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F02E0216-4AE3-474F-9381-FCB93411CDB0}.Debug|x64.ActiveCfg = Debug|x64
+		{F02E0216-4AE3-474F-9381-FCB93411CDB0}.Debug|x64.Build.0 = Debug|x64
 		{F02E0216-4AE3-474F-9381-FCB93411CDB0}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{F02E0216-4AE3-474F-9381-FCB93411CDB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F02E0216-4AE3-474F-9381-FCB93411CDB0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F02E0216-4AE3-474F-9381-FCB93411CDB0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F02E0216-4AE3-474F-9381-FCB93411CDB0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{F02E0216-4AE3-474F-9381-FCB93411CDB0}.Release|x64.ActiveCfg = Release|x64
+		{F02E0216-4AE3-474F-9381-FCB93411CDB0}.Release|x64.Build.0 = Release|x64
 		{F02E0216-4AE3-474F-9381-FCB93411CDB0}.Release|x86.ActiveCfg = Release|Any CPU
 		{1B058920-24B4-4140-8AE7-C8C6C38CA52D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1B058920-24B4-4140-8AE7-C8C6C38CA52D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1B058920-24B4-4140-8AE7-C8C6C38CA52D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{1B058920-24B4-4140-8AE7-C8C6C38CA52D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1B058920-24B4-4140-8AE7-C8C6C38CA52D}.Debug|x64.ActiveCfg = Debug|x64
+		{1B058920-24B4-4140-8AE7-C8C6C38CA52D}.Debug|x64.Build.0 = Debug|x64
 		{1B058920-24B4-4140-8AE7-C8C6C38CA52D}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{1B058920-24B4-4140-8AE7-C8C6C38CA52D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1B058920-24B4-4140-8AE7-C8C6C38CA52D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1B058920-24B4-4140-8AE7-C8C6C38CA52D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1B058920-24B4-4140-8AE7-C8C6C38CA52D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{1B058920-24B4-4140-8AE7-C8C6C38CA52D}.Release|x64.ActiveCfg = Release|x64
+		{1B058920-24B4-4140-8AE7-C8C6C38CA52D}.Release|x64.Build.0 = Release|x64
 		{1B058920-24B4-4140-8AE7-C8C6C38CA52D}.Release|x86.ActiveCfg = Release|Any CPU
 		{7E4E8DB5-85AD-4388-BDCB-38C6F423B8B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7E4E8DB5-85AD-4388-BDCB-38C6F423B8B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7E4E8DB5-85AD-4388-BDCB-38C6F423B8B0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{7E4E8DB5-85AD-4388-BDCB-38C6F423B8B0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7E4E8DB5-85AD-4388-BDCB-38C6F423B8B0}.Debug|x64.ActiveCfg = Debug|x64
+		{7E4E8DB5-85AD-4388-BDCB-38C6F423B8B0}.Debug|x64.Build.0 = Debug|x64
 		{7E4E8DB5-85AD-4388-BDCB-38C6F423B8B0}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{7E4E8DB5-85AD-4388-BDCB-38C6F423B8B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7E4E8DB5-85AD-4388-BDCB-38C6F423B8B0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7E4E8DB5-85AD-4388-BDCB-38C6F423B8B0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7E4E8DB5-85AD-4388-BDCB-38C6F423B8B0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{7E4E8DB5-85AD-4388-BDCB-38C6F423B8B0}.Release|x64.ActiveCfg = Release|x64
+		{7E4E8DB5-85AD-4388-BDCB-38C6F423B8B0}.Release|x64.Build.0 = Release|x64
 		{7E4E8DB5-85AD-4388-BDCB-38C6F423B8B0}.Release|x86.ActiveCfg = Release|Any CPU
 		{B1D0ECB6-3D40-4F6B-A59B-5370EDE51946}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B1D0ECB6-3D40-4F6B-A59B-5370EDE51946}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B1D0ECB6-3D40-4F6B-A59B-5370EDE51946}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{B1D0ECB6-3D40-4F6B-A59B-5370EDE51946}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B1D0ECB6-3D40-4F6B-A59B-5370EDE51946}.Debug|x64.ActiveCfg = Debug|x64
+		{B1D0ECB6-3D40-4F6B-A59B-5370EDE51946}.Debug|x64.Build.0 = Debug|x64
 		{B1D0ECB6-3D40-4F6B-A59B-5370EDE51946}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{B1D0ECB6-3D40-4F6B-A59B-5370EDE51946}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B1D0ECB6-3D40-4F6B-A59B-5370EDE51946}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B1D0ECB6-3D40-4F6B-A59B-5370EDE51946}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B1D0ECB6-3D40-4F6B-A59B-5370EDE51946}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{B1D0ECB6-3D40-4F6B-A59B-5370EDE51946}.Release|x64.ActiveCfg = Release|x64
+		{B1D0ECB6-3D40-4F6B-A59B-5370EDE51946}.Release|x64.Build.0 = Release|x64
 		{B1D0ECB6-3D40-4F6B-A59B-5370EDE51946}.Release|x86.ActiveCfg = Release|Any CPU
 		{21A77A4B-2FF8-4ACF-BD1D-E7E7515147E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{21A77A4B-2FF8-4ACF-BD1D-E7E7515147E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{21A77A4B-2FF8-4ACF-BD1D-E7E7515147E7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{21A77A4B-2FF8-4ACF-BD1D-E7E7515147E7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{21A77A4B-2FF8-4ACF-BD1D-E7E7515147E7}.Debug|x64.ActiveCfg = Debug|x64
+		{21A77A4B-2FF8-4ACF-BD1D-E7E7515147E7}.Debug|x64.Build.0 = Debug|x64
 		{21A77A4B-2FF8-4ACF-BD1D-E7E7515147E7}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{21A77A4B-2FF8-4ACF-BD1D-E7E7515147E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{21A77A4B-2FF8-4ACF-BD1D-E7E7515147E7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{21A77A4B-2FF8-4ACF-BD1D-E7E7515147E7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{21A77A4B-2FF8-4ACF-BD1D-E7E7515147E7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{21A77A4B-2FF8-4ACF-BD1D-E7E7515147E7}.Release|x64.ActiveCfg = Release|x64
+		{21A77A4B-2FF8-4ACF-BD1D-E7E7515147E7}.Release|x64.Build.0 = Release|x64
 		{21A77A4B-2FF8-4ACF-BD1D-E7E7515147E7}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
diff --git a/Source/HtmlRenderer/HtmlRenderer.csproj b/Source/HtmlRenderer/HtmlRenderer.csproj
index 1fa0da034..aa9fbbbc1 100644
--- a/Source/HtmlRenderer/HtmlRenderer.csproj
+++ b/Source/HtmlRenderer/HtmlRenderer.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{FE611685-391F-4E3E-B27E-D3150E51E49B}</ProjectGuid>
+    <ProjectGuid>{B1D0ECB6-3D40-4F6B-A59B-5370EDE51946}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>HtmlRenderer</RootNamespace>
@@ -43,6 +43,24 @@
     <OutputPath>bin\x86\Release\</OutputPath>
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />

From 57a384fd4954230286d067ec9e3e3a6259482911 Mon Sep 17 00:00:00 2001
From: slagou <steven.lagou@oneviewcommerce.com>
Date: Tue, 31 Jan 2017 15:11:15 -0500
Subject: [PATCH 09/10] Samples

---
 Source/Demo/Common/Samples/02.Text.htm     | 10 +++----
 Source/Demo/Common/TestSamples/12.Text.htm | 14 ++++-----
 Source/Demo/Common/TestSamples/22.RTL.htm  | 34 +++++++++++-----------
 3 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/Source/Demo/Common/Samples/02.Text.htm b/Source/Demo/Common/Samples/02.Text.htm
index b7aee3fa9..a54efc868 100644
--- a/Source/Demo/Common/Samples/02.Text.htm
+++ b/Source/Demo/Common/Samples/02.Text.htm
@@ -2,11 +2,11 @@
     <head>
         <title>Text</title>
         <link rel="Stylesheet" href="StyleSheet" />
-        <style type="text/css">
-            ::selection {
-                color: #bb5555;
-                background-color: #aaddaa;
-            }
+        <style type="text/css">
+            ::selection {
+                color: #bb5555;
+                background-color: #aaddaa;
+            }
         </style>
     </head>
     <body>
diff --git a/Source/Demo/Common/TestSamples/12.Text.htm b/Source/Demo/Common/TestSamples/12.Text.htm
index c53a43609..833196bae 100644
--- a/Source/Demo/Common/TestSamples/12.Text.htm
+++ b/Source/Demo/Common/TestSamples/12.Text.htm
@@ -2,13 +2,13 @@
     <head>
         <title>Text</title>
         <link rel="Stylesheet" href="StyleSheet" />
-        <style>
-            .right {
-                text-align: right;
-                border-width: 1px;
-                border-style: solid;
-                border-color: blue;
-            }
+        <style>
+            .right {
+                text-align: right;
+                border-width: 1px;
+                border-style: solid;
+                border-color: blue;
+            }
         </style>
     </head>
     <body>
diff --git a/Source/Demo/Common/TestSamples/22.RTL.htm b/Source/Demo/Common/TestSamples/22.RTL.htm
index 35bf9bf6c..a24d4f4e7 100644
--- a/Source/Demo/Common/TestSamples/22.RTL.htm
+++ b/Source/Demo/Common/TestSamples/22.RTL.htm
@@ -1,18 +1,18 @@
-<html>
-    <body>
-        <div dir="rtl">
-            <div>שלום עולם, יש <b>ברבורים </b>בעגם הזה</div>
-            <br />
-            <div>שלום עולם, יש ברבורים בעגם הזה</div>
-            <div>שלום עולם, יש ברבורים בעגם הזה</div>
-        </div>
-        <hr />
-        <div dir="rtl">
-            <div>שלום עולם,<span>hello world</span> יש ברבורים בעגם הזה</div>
-            <br />
-            <div>שלום עולם, יש ברבורים בעגם הזה</div>
-            <div>שלום עולם, יש ברבורים בעגם הזה</div>
-        </div>
-        <hr />
-    </body>
+<html>
+    <body>
+        <div dir="rtl">
+            <div>שלום עולם, יש <b>ברבורים </b>בעגם הזה</div>
+            <br />
+            <div>שלום עולם, יש ברבורים בעגם הזה</div>
+            <div>שלום עולם, יש ברבורים בעגם הזה</div>
+        </div>
+        <hr />
+        <div dir="rtl">
+            <div>שלום עולם,<span>hello world</span> יש ברבורים בעגם הזה</div>
+            <br />
+            <div>שלום עולם, יש ברבורים בעגם הזה</div>
+            <div>שלום עולם, יש ברבורים בעגם הזה</div>
+        </div>
+        <hr />
+    </body>
 </html>
\ No newline at end of file

From 7a81677047fb118d48084df41acba7196337de07 Mon Sep 17 00:00:00 2001
From: slagou <steven.lagou@oneviewcommerce.com>
Date: Tue, 31 Jan 2017 15:25:23 -0500
Subject: [PATCH 10/10] 64-bit build

---
 Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj | 6 +++---
 Source/HtmlRenderer/HtmlRenderer.csproj                   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj b/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj
index eebcac1dd..6562848bd 100644
--- a/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj
+++ b/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{21A77A4B-2FF8-4ACF-BD1D-E7E7515147E7}</ProjectGuid>
+    <ProjectGuid>{CA249F5D-9285-40A6-B217-5889EF79FD7E}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>HtmlRenderer.PdfSharp</RootNamespace>
@@ -65,11 +65,11 @@
   </PropertyGroup>
   <ItemGroup>
     <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>
+      <HintPath>..\..\..\..\packages\PDFsharp.1.50.4000-beta3b\lib\net20\PdfSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <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>
+      <HintPath>..\..\..\..\packages\PDFsharp.1.50.4000-beta3b\lib\net20\PdfSharp.Charting.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/Source/HtmlRenderer/HtmlRenderer.csproj b/Source/HtmlRenderer/HtmlRenderer.csproj
index aa9fbbbc1..8137fd4bf 100644
--- a/Source/HtmlRenderer/HtmlRenderer.csproj
+++ b/Source/HtmlRenderer/HtmlRenderer.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{B1D0ECB6-3D40-4F6B-A59B-5370EDE51946}</ProjectGuid>
+    <ProjectGuid>{FE611685-391F-4E3E-B27E-D3150E51E49B}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>HtmlRenderer</RootNamespace>