diff --git a/Source/.vs/HtmlRenderer/v15/Server/sqlite3/db.lock b/Source/.vs/HtmlRenderer/v15/Server/sqlite3/db.lock
new file mode 100644
index 000000000..e69de29bb
diff --git a/Source/.vs/HtmlRenderer/v15/Server/sqlite3/storage.ide b/Source/.vs/HtmlRenderer/v15/Server/sqlite3/storage.ide
new file mode 100644
index 000000000..df355ebe8
Binary files /dev/null and b/Source/.vs/HtmlRenderer/v15/Server/sqlite3/storage.ide differ
diff --git a/Source/.vs/HtmlRenderer/v15/Server/sqlite3/storage.ide-shm b/Source/.vs/HtmlRenderer/v15/Server/sqlite3/storage.ide-shm
new file mode 100644
index 000000000..e14ac0af5
Binary files /dev/null and b/Source/.vs/HtmlRenderer/v15/Server/sqlite3/storage.ide-shm differ
diff --git a/Source/.vs/HtmlRenderer/v15/Server/sqlite3/storage.ide-wal b/Source/.vs/HtmlRenderer/v15/Server/sqlite3/storage.ide-wal
new file mode 100644
index 000000000..c3f25d207
Binary files /dev/null and b/Source/.vs/HtmlRenderer/v15/Server/sqlite3/storage.ide-wal differ
diff --git a/Source/Demo/WinForms/HtmlRenderer.Demo.WinForms.csproj b/Source/Demo/WinForms/HtmlRenderer.Demo.WinForms.csproj
index 95dafc2f1..fd9a4be9b 100644
--- a/Source/Demo/WinForms/HtmlRenderer.Demo.WinForms.csproj
+++ b/Source/Demo/WinForms/HtmlRenderer.Demo.WinForms.csproj
@@ -16,6 +16,11 @@
2.0
+ false
+
+
+ ..\..\
+ true
publish\
true
Disk
@@ -28,13 +33,8 @@
true
0
1.0.0.%2a
- false
false
true
-
-
- ..\..\
- true
true
@@ -63,13 +63,8 @@
html.ico
-
- ..\..\packages\PDFsharp.1.50.4000-beta3b\lib\net20\PdfSharp.dll
- True
-
-
- ..\..\packages\PDFsharp.1.50.4000-beta3b\lib\net20\PdfSharp.Charting.dll
- True
+
+ ..\..\..\..\PDFsharp\src\PdfSharp.Charting\bin\Release\PdfSharp.dll
@@ -170,9 +165,6 @@
-
-
-
diff --git a/Source/Demo/WinForms/packages.config b/Source/Demo/WinForms/packages.config
deleted file mode 100644
index 2f092fd78..000000000
--- a/Source/Demo/WinForms/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/Source/HtmlRenderer.PdfSharp/Adapters/PdfSharpAdapter.cs b/Source/HtmlRenderer.PdfSharp/Adapters/PdfSharpAdapter.cs
index e5fa309c0..8b2e701bd 100644
--- a/Source/HtmlRenderer.PdfSharp/Adapters/PdfSharpAdapter.cs
+++ b/Source/HtmlRenderer.PdfSharp/Adapters/PdfSharpAdapter.cs
@@ -15,6 +15,7 @@
using System.Drawing;
using System.Drawing.Text;
using System.IO;
+using System.Text;
using TheArtOfDev.HtmlRenderer.Adapters;
using TheArtOfDev.HtmlRenderer.Adapters.Entities;
using TheArtOfDev.HtmlRenderer.PdfSharp.Utilities;
@@ -43,6 +44,8 @@ private PdfSharpAdapter()
{
AddFontFamilyMapping("monospace", "Courier New");
AddFontFamilyMapping("Helvetica", "Arial");
+ AddFontFamilyMapping("Noto Sans CJK SC Regular", "黑体"); //Works when no-unicode program is English
+
var families = new InstalledFontCollection();
diff --git a/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj b/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj
index ef0fd7acc..6c34c5ae7 100644
--- a/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj
+++ b/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj
@@ -32,13 +32,21 @@
4
-
- ..\packages\PDFsharp.1.50.4000-beta3b\lib\net20\PdfSharp.dll
- True
+
+
+ False
+ ..\..\..\PDFsharp\src\PdfSharp.Charting\bin\Release\PdfSharp.dll
+
+
+ False
+ ..\..\..\PDFsharp\src\PdfSharp.Charting\bin\Release\PdfSharp.Charting.dll
@@ -69,9 +77,6 @@
HtmlRenderer
-
-
-
diff --git a/Source/HtmlRenderer.PdfSharp/packages.config b/Source/HtmlRenderer.PdfSharp/packages.config
deleted file mode 100644
index 2f092fd78..000000000
--- a/Source/HtmlRenderer.PdfSharp/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/Source/SharedAssemblyInfo.cs b/Source/SharedAssemblyInfo.cs
index d5336037f..f6c2f6fc2 100644
--- a/Source/SharedAssemblyInfo.cs
+++ b/Source/SharedAssemblyInfo.cs
@@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Open source hosted on CodePlex")]
[assembly: AssemblyProduct("HTML Renderer")]
-[assembly: AssemblyCopyright("Copyright © 2008")]
+[assembly: AssemblyCopyright("Copyright © 2019")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -26,4 +26,4 @@
// Version information for an assembly consists of the following four values:
-[assembly: AssemblyVersion("1.5.1.0")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.5.1.2")]
\ No newline at end of file