Ignore .issues directory

Migrate to Sdk projects.
Bump version 1.6.1.
Migrate to NetStandar2.0.

.gitignore

@@ -29,3 +29,6 @@ _ReSharper*/
 *.nupkg
 
 .vs
+PDFTests
+Doc
+/.issues/

README.md

@@ -5,36 +5,41 @@
 ### VAR.PdfTools
 Add the resulting assembly as reference in your projects, and this line on code:
 
+```csharp
 using VAR.PdfTools;
+```
 
 Then extract the contents of a data column using:
 
+```csharp
 var columnData = new List<string>();
 PdfDocument doc = PdfDocument.Load("document.pdf");
 foreach (PdfDocumentPage page in doc.Pages)
 {
     PdfTextExtractor extractor = new PdfTextExtractor(page);
-        columnData.AddRange(extractor.GetColumn("Column"));
+    columnData.AddRange(extractor.GetColumnAsStrings("Column"));
 }
+```
 
 Or the content of a field (text on the right of the indicated text):
 
+```csharp
 var fieldData = new List<string>();
 PdfDocument doc = PdfDocument.Load("document.pdf");
 foreach (PdfDocumentPage page in doc.Pages)
 {
     PdfTextExtractor extractor = new PdfTextExtractor(page);
-        fieldData.Add(extractor.GetField(txtFieldName.Text));
+    fieldData.Add(extractor.GetFieldAsString(txtFieldName.Text));
 }
+```
 
 ### VAR.PdfTools.Workbench
 It is a simple Windows.Forms application, to test basic funcitionallity of the library.
 
 ## Building
-A Visual Studio 2015 and 2010 solutions are provided. Simply, click build on the IDE.
+A Visual Studio solution is provided. Simply, click build on the IDE.
 
-A .nuget package can be build using:
-	VAR.PdfTools\Build.NuGet.cmd
+The build generates a DLL and a Nuget package.
 
 ## Contributing
 1. Fork it!
@@ -46,26 +51,3 @@ A .nuget package can be build using:
 ## Credits
 * Valeriano Alfonso Rodriguez.
 
-## License
-
-    The MIT License (MIT)
-
-    Copyright (c) 2016-2017 Valeriano Alfonso Rodriguez
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE.

VAR.PdfTools.Workbench/Configuration.cs

@@ -0,0 +1,117 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace VAR.PdfTools.Workbench
+{
+    public class Configuration
+    {
+        private Dictionary<string, string> _configItems = new Dictionary<string, string>();
+
+        private static string GetConfigFileName()
+        {
+            string location = System.Reflection.Assembly.GetEntryAssembly().Location;
+            string path = Path.GetDirectoryName(location);
+            string filenameWithoutExtension = Path.GetFileNameWithoutExtension(location);
+
+            string configFile = string.Format("{0}/{1}.cfg", path, filenameWithoutExtension);
+            return configFile;
+        }
+
+        private static string[] GetConfigurationLines()
+        {
+            string configFile = GetConfigFileName();
+            string[] config;
+            if (File.Exists(configFile) == false)
+            {
+                config = new string[0];
+            }
+            else
+            {
+                config = File.ReadAllLines(configFile);
+            }
+            return config;
+        }
+
+        public void Load()
+        {
+            _configItems.Clear();
+            string[] configLines = GetConfigurationLines();
+            foreach (string configLine in configLines)
+            {
+                int idxSplit = configLine.IndexOf('|');
+                if (idxSplit < 0) { continue; }
+                string configName = configLine.Substring(0, idxSplit);
+                string configData = configLine.Substring(idxSplit + 1);
+
+                if (_configItems.ContainsKey(configName))
+                {
+                    _configItems[configName] = configData;
+                }
+                else
+                {
+                    _configItems.Add(configName, configData);
+                }
+            }
+        }
+
+        public void Save()
+        {
+            StringBuilder sbConfig = new StringBuilder();
+            foreach (KeyValuePair<string, string> pair in _configItems)
+            {
+                sbConfig.AppendFormat("{0}|{1}\n", pair.Key, pair.Value);
+            }
+            string configFileName = GetConfigFileName();
+            File.WriteAllText(configFileName, sbConfig.ToString());
+        }
+
+        public string Get(string key, string defaultValue)
+        {
+            if (_configItems == null) { return defaultValue; }
+            if (_configItems.ContainsKey(key))
+            {
+                return _configItems[key];
+            }
+            return defaultValue;
+        }
+
+        public bool Get(string key, bool defaultValue)
+        {
+            if (_configItems == null) { return defaultValue; }
+            if (_configItems.ContainsKey(key))
+            {
+                string value = _configItems[key];
+                return (value == "true");
+            }
+            return defaultValue;
+        }
+
+        public void Set(string key, string value)
+        {
+            if (_configItems == null) { return; }
+            if (_configItems.ContainsKey(key))
+            {
+                _configItems[key] = value;
+            }
+            else
+            {
+                _configItems.Add(key, value);
+            }
+        }
+
+        public void Set(string key, bool value)
+        {
+            if (_configItems == null) { return; }
+            if (_configItems.ContainsKey(key))
+            {
+                _configItems[key] = value ? "true" : "false";
+            }
+            else
+            {
+                _configItems.Add(key, value ? "true" : "false");
+            }
+        }
+
+    }
+}

VAR.PdfTools.Workbench/FrmPdfInfo.Designer.cs

@@ -47,6 +47,8 @@
             this.btnGetField3 = new System.Windows.Forms.Button();
             this.txtField3 = new System.Windows.Forms.TextBox();
             this.btnGetColumn3 = new System.Windows.Forms.Button();
+            this.txtPages = new System.Windows.Forms.TextBox();
+            this.chkRender = new System.Windows.Forms.CheckBox();
             this.SuspendLayout();
             // 
             // lblOutputs
@@ -119,7 +121,7 @@
             // 
             this.btnGetColumn1.Location = new System.Drawing.Point(292, 51);
             this.btnGetColumn1.Name = "btnGetColumn1";
-            this.btnGetColumn1.Size = new System.Drawing.Size(60, 23);
+            this.btnGetColumn1.Size = new System.Drawing.Size(69, 23);
             this.btnGetColumn1.TabIndex = 12;
             this.btnGetColumn1.Text = "GetColumn";
             this.btnGetColumn1.UseVisualStyleBackColor = true;
@@ -194,7 +196,7 @@
             // 
             this.btnGetColumn2.Location = new System.Drawing.Point(292, 80);
             this.btnGetColumn2.Name = "btnGetColumn2";
-            this.btnGetColumn2.Size = new System.Drawing.Size(60, 23);
+            this.btnGetColumn2.Size = new System.Drawing.Size(69, 23);
             this.btnGetColumn2.TabIndex = 19;
             this.btnGetColumn2.Text = "GetColumn";
             this.btnGetColumn2.UseVisualStyleBackColor = true;
@@ -231,17 +233,37 @@
             // 
             this.btnGetColumn3.Location = new System.Drawing.Point(292, 109);
             this.btnGetColumn3.Name = "btnGetColumn3";
-            this.btnGetColumn3.Size = new System.Drawing.Size(60, 23);
+            this.btnGetColumn3.Size = new System.Drawing.Size(69, 23);
             this.btnGetColumn3.TabIndex = 23;
             this.btnGetColumn3.Text = "GetColumn";
             this.btnGetColumn3.UseVisualStyleBackColor = true;
             this.btnGetColumn3.Click += new System.EventHandler(this.btnGetColumn3_Click);
             // 
+            // txtPages
+            // 
+            this.txtPages.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtPages.Location = new System.Drawing.Point(397, 82);
+            this.txtPages.Name = "txtPages";
+            this.txtPages.Size = new System.Drawing.Size(75, 20);
+            this.txtPages.TabIndex = 27;
+            // 
+            // chkRender
+            // 
+            this.chkRender.AutoSize = true;
+            this.chkRender.Location = new System.Drawing.Point(292, 138);
+            this.chkRender.Name = "chkRender";
+            this.chkRender.Size = new System.Drawing.Size(61, 17);
+            this.chkRender.TabIndex = 28;
+            this.chkRender.Text = "Render";
+            this.chkRender.UseVisualStyleBackColor = true;
+            // 
             // FrmPdfInfo
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(484, 461);
+            this.Controls.Add(this.chkRender);
+            this.Controls.Add(this.txtPages);
             this.Controls.Add(this.btnHasText3);
             this.Controls.Add(this.btnGetField3);
             this.Controls.Add(this.txtField3);
@@ -291,5 +313,7 @@
         private System.Windows.Forms.Button btnGetField3;
         private System.Windows.Forms.TextBox txtField3;
         private System.Windows.Forms.Button btnGetColumn3;
+        private System.Windows.Forms.TextBox txtPages;
+        private System.Windows.Forms.CheckBox chkRender;
     }
 }

VAR.PdfTools.Workbench/FrmPdfInfo.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
-using System.Drawing.Drawing2D;
 using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
@@ -20,19 +19,27 @@ namespace VAR.PdfTools.Workbench
 
         private void FrmPdfInfo_Load(object sender, EventArgs e)
         {
-            txtPdfPath.Text = Properties.Settings.Default.LastPdfPath;
-            txtField1.Text = Properties.Settings.Default.Field1;
-            txtField2.Text = Properties.Settings.Default.Field2;
-            txtField3.Text = Properties.Settings.Default.Field3;
+            var configuration = new Configuration();
+            configuration.Load();
+            txtPdfPath.Text = configuration.Get("LastPdfPath", string.Empty);
+            txtField1.Text = configuration.Get("Field1", string.Empty);
+            txtField2.Text = configuration.Get("Field2", string.Empty);
+            txtField3.Text = configuration.Get("Field3", string.Empty);
+            txtPages.Text = configuration.Get("Pages", string.Empty);
+            chkRender.Checked = configuration.Get("Render", false);
         }
 
         private void FrmPdfInfo_FormClosing(object sender, FormClosingEventArgs e)
         {
-            Properties.Settings.Default.LastPdfPath = txtPdfPath.Text;
-            Properties.Settings.Default.Field1 = txtField1.Text;
-            Properties.Settings.Default.Field2 = txtField2.Text;
-            Properties.Settings.Default.Field3 = txtField3.Text;
-            Properties.Settings.Default.Save();
+            var configuration = new Configuration();
+            var configItems = new Dictionary<string, string>();
+            configuration.Set("LastPdfPath", txtPdfPath.Text);
+            configuration.Set("Field1", txtField1.Text);
+            configuration.Set("Field2", txtField2.Text);
+            configuration.Set("Field3", txtField3.Text);
+            configuration.Set("Pages", txtPages.Text);
+            configuration.Set("Render", chkRender.Checked);
+            configuration.Save();
         }
 
         private void btnBrowse_Click(object sender, EventArgs e)
@@ -191,6 +198,55 @@ namespace VAR.PdfTools.Workbench
             Action_GetColumn(pdfPath, column);
         }
 
+        private IEnumerable<int> GetSelectedPages(int maxPages)
+        {
+            string pages = txtPages.Text;
+            if (string.IsNullOrEmpty(pages))
+            {
+                return Enumerable.Range(1, maxPages);
+            }
+
+            string[] pagesParts;
+            if (pages.Contains(","))
+            {
+                pagesParts = pages.Split(',');
+            }
+            else
+            {
+                pagesParts = new string[] { pages };
+            }
+            List<int> listPages = new List<int>();
+            foreach (string part in pagesParts)
+            {
+                if (part.Contains("-"))
+                {
+                    string[] range = part.Split('-');
+                    if (range.Length == 2)
+                    {
+                        int pageStart;
+                        int pageEnd;
+                        if (int.TryParse(range[0], out pageStart) && int.TryParse(range[1], out pageEnd))
+                        {
+                            listPages.AddRange(Enumerable.Range(pageStart, (pageEnd - pageStart) + 1));
+                        }
+                    }
+                }
+                else
+                {
+                    int pageNum;
+                    if (int.TryParse(part, out pageNum))
+                    {
+                        listPages.Add(pageNum);
+                    }
+                }
+            }
+            if (listPages.Count == 0)
+            {
+                listPages.AddRange(Enumerable.Range(1, maxPages));
+            }
+            return listPages;
+        }
+
         private void Action_HasText(string pdfPath, string text)
         {
             if (System.IO.File.Exists(pdfPath) == false)
@@ -201,10 +257,13 @@ namespace VAR.PdfTools.Workbench
 
             PdfDocument doc = PdfDocument.Load(pdfPath);
 
+            IEnumerable<int> selectedPages = GetSelectedPages(doc.Pages.Count);
             List<string> lines = new List<string>();
-            int pageNum = 1;
+            int pageNum = 0;
             foreach (PdfDocumentPage page in doc.Pages)
             {
+                pageNum++;
+                if (selectedPages.Contains(pageNum) == false) { continue; }
                 PdfTextExtractor extractor = new PdfTextExtractor(page);
                 lines.Add(string.Format("Page({0}) : {1}", pageNum, Convert.ToString(extractor.HasText(text))));
             }
@@ -221,11 +280,15 @@ namespace VAR.PdfTools.Workbench
 
             PdfDocument doc = PdfDocument.Load(pdfPath);
 
+            IEnumerable<int> selectedPages = GetSelectedPages(doc.Pages.Count);
             var fieldData = new List<string>();
+            int pageNum = 0;
             foreach (PdfDocumentPage page in doc.Pages)
             {
+                pageNum++;
+                if (selectedPages.Contains(pageNum) == false) { continue; }
                 PdfTextExtractor extractor = new PdfTextExtractor(page);
-                fieldData.Add(extractor.GetField(field));
+                fieldData.Add(extractor.GetFieldAsString(field));
             }
             txtOutput.Lines = fieldData.ToArray();
         }
@@ -239,14 +302,43 @@ namespace VAR.PdfTools.Workbench
             }
 
             PdfDocument doc = PdfDocument.Load(pdfPath);
+            string baseDocumentPath = Path.GetDirectoryName(txtPdfPath.Text);
+            string baseDocumentFilename = Path.GetFileNameWithoutExtension(txtPdfPath.Text);
 
-            var columnData = new List<string>();
+            IEnumerable<int> selectedPages = GetSelectedPages(doc.Pages.Count);
+            var columns = new List<string>();
+            int pageNum = 0;
             foreach (PdfDocumentPage page in doc.Pages)
             {
+                pageNum++;
+                if (selectedPages.Contains(pageNum) == false) { continue; }
                 PdfTextExtractor extractor = new PdfTextExtractor(page);
-                columnData.AddRange(extractor.GetColumn(column));
+                PdfTextElementColumn columnData;
+                if (column.StartsWith("#"))
+                {
+                    string[] columnParts = column.Substring(1).Split(';');
+                    double y = Convert.ToDouble(columnParts[0]);
+                    double x1 = Convert.ToDouble(columnParts[1]);
+                    double x2 = Convert.ToDouble(columnParts[2]);
+                    columnData = extractor.GetColumn(null, y, x1, x2, x1, x2);
                 }
-            txtOutput.Lines = columnData.ToArray();
+                else
+                {
+                    columnData = extractor.GetColumn(column);
+                }
+                if (chkRender.Checked)
+                {
+                    var pdfPageRenderer = new PdfPageRenderer(extractor);
+                    Bitmap bmp = pdfPageRenderer.Render();
+                    pdfPageRenderer.RenderColumn(columnData, bmp);
+                    string fileName = Path.Combine(baseDocumentPath, string.Format("{0}_{1:0000}.png", baseDocumentFilename, pageNum));
+                    bmp.Save(fileName, ImageFormat.Png);
+                    bmp.Dispose();
+                    GC.Collect();
+                }
+                columns.AddRange(columnData.Elements.Select(t => t.VisibleText));
+            }
+            txtOutput.Lines = columns.ToArray();
         }
 
         private void btnRender_Click(object sender, EventArgs e)
@@ -257,8 +349,6 @@ namespace VAR.PdfTools.Workbench
                 return;
             }
 
-            int MaxSize = 10000;
-
             PdfDocument doc = PdfDocument.Load(txtPdfPath.Text);
             string baseDocumentPath = Path.GetDirectoryName(txtPdfPath.Text);
             string baseDocumentFilename = Path.GetFileNameWithoutExtension(txtPdfPath.Text);
@@ -267,139 +357,26 @@ namespace VAR.PdfTools.Workbench
             lines.Add(string.Format("Filename : {0}", baseDocumentFilename));
             lines.Add(string.Format("Number of Pages : {0}", doc.Pages.Count));
 
-            int pageNumber = 1;
+            IEnumerable<int> selectedPages = GetSelectedPages(doc.Pages.Count);
+            int pageNum = 0;
             foreach (PdfDocumentPage page in doc.Pages)
             {
-                double pageXMin = double.MaxValue;
-                double pageYMin = double.MaxValue;
-                double pageXMax = double.MinValue;
-                double pageYMax = double.MinValue;
+                pageNum++;
+                if (selectedPages.Contains(pageNum) == false) { continue; }
 
-                // Preprocess page to get max size
-                PdfTextExtractor extractor = new PdfTextExtractor(page);
-                foreach (PdfTextElement textElement in extractor.Elements)
-                {
-                    double textElementXMin = textElement.GetX();
-                    double textElementYMax = textElement.GetY();
-                    double textElementXMax = textElementXMin + textElement.VisibleWidth;
-                    double textElementYMin = textElementYMax - textElement.VisibleHeight;
+                PdfPageRenderer pdfPageRenderer = new PdfPageRenderer(page);
+                Bitmap bmp = pdfPageRenderer.Render();
 
-                    if (textElementXMax > pageXMax) { pageXMax = textElementXMax; }
-                    if (textElementYMax > pageYMax) { pageYMax = textElementYMax; }
-                    if (textElementXMin < pageXMin) { pageXMin = textElementXMin; }
-                    if (textElementYMin < pageYMin) { pageYMin = textElementYMin; }
-                }
-                lines.Add(string.Format("Page {0:0000} TextElements : {1}", pageNumber, extractor.Elements.Count));
-
-                // Prepare page image
-                int pageWidth = (int)Math.Ceiling(pageXMax - pageXMin);
-                int pageHeight = (int)Math.Ceiling(pageYMax - pageYMin);
-                int Scale = 10;
-                while ((pageWidth * Scale) > MaxSize) { Scale--; }
-                while ((pageHeight * Scale) > MaxSize) { Scale--; }
-                if (Scale <= 0) { Scale = 1; }
-                using (Bitmap bmp = new Bitmap(pageWidth * Scale, pageHeight * Scale, PixelFormat.Format32bppArgb))
-                using (Graphics gc = Graphics.FromImage(bmp))
-                using (Pen penTextElem = new Pen(Color.Blue))
-                {
-                    gc.Clear(Color.White);
-
-                    // Draw text elements
-                    foreach (PdfTextElement textElement in extractor.Elements)
-                    {
-                        DrawTextElement(textElement, gc, penTextElem, Scale, pageHeight, pageXMin, pageYMin);
-                    }
+                lines.Add(string.Format("Page {0:0000} TextElements : {1}", pageNum, pdfPageRenderer.Extractor.Elements.Count));
 
                 // Save image to disk
-                    string fileName = Path.Combine(baseDocumentPath, string.Format("{0}_{1:0000}.png", baseDocumentFilename, pageNumber));
+                string fileName = Path.Combine(baseDocumentPath, string.Format("{0}_{1:0000}.png", baseDocumentFilename, pageNum));
                 bmp.Save(fileName, ImageFormat.Png);
-                }
-                pageNumber++;
+                bmp.Dispose();
+                GC.Collect();
             }
 
             txtOutput.Lines = lines.ToArray();
         }
-        
-        private static void DrawTextElement(PdfTextElement textElement, Graphics gc, Pen penTextElem, int Scale, int pageHeight, double pageXMin, double pageYMin)
-        {
-            double textElementX = textElement.GetX() - pageXMin;
-            double textElementY = textElement.GetY() - pageYMin;
-            double textElementWidth = textElement.VisibleWidth;
-            double textElementHeight = textElement.VisibleHeight;
-            string textElementText = textElement.VisibleText;
-            string textElementFontName = (textElement.Font == null ? string.Empty : textElement.Font.Name);
-
-            if (textElementHeight < 0.0001) { return; }
-
-            double textElementPageX = textElementX;
-            double textElementPageY = pageHeight - textElementY;
-            
-            DrawRoundedRectangle(gc, penTextElem,
-                (int)(textElementPageX * Scale),
-                (int)(textElementPageY * Scale),
-                (int)(textElementWidth * Scale),
-                (int)(textElementHeight * Scale),
-                5);
-            
-            using (Font font = new Font("Arial", (int)(textElementHeight * Scale), GraphicsUnit.Pixel))
-            {
-                foreach (PdfCharElement c in textElement.Characters)
-                {
-                    gc.DrawString(c.Char,
-                        font,
-                        Brushes.Black,
-                        (int)((textElementPageX + c.Displacement) * Scale),
-                        (int)(textElementPageY * Scale));
-                    gc.FillRectangle(Brushes.Red,
-                        (int)((textElementPageX + c.Displacement) * Scale),
-                        (int)(textElementPageY * Scale),
-                        2, 2);
-                    gc.FillRectangle(Brushes.Green,
-                        (int)((textElementPageX + c.Displacement + c.Width) * Scale),
-                        (int)(textElementPageY * Scale),
-                        2, 2);
-                }
-            }
-        }
-        
-        public static GraphicsPath RoundedRect(int x, int y, int width, int height, int radius)
-        {
-            int diameter = radius * 2;
-            Size size = new Size(diameter, diameter);
-            Rectangle arc = new Rectangle(x, y, diameter, diameter);
-            GraphicsPath path = new GraphicsPath();
-            
-            // top left arc 
-            path.AddArc(arc, 180, 90);
-
-            // top right arc  
-            arc.X = (x + width) - diameter;
-            path.AddArc(arc, 270, 90);
-
-            // bottom right arc  
-            arc.Y = (y + height) - diameter;
-            path.AddArc(arc, 0, 90);
-
-            // bottom left arc 
-            arc.X = x;
-            path.AddArc(arc, 90, 90);
-
-            path.CloseFigure();
-            return path;
-        }
-
-        public static void DrawRoundedRectangle(Graphics graphics, Pen pen, int x, int y, int width, int height, int cornerRadius)
-        {
-            if (graphics == null)
-                throw new ArgumentNullException("graphics");
-            if (pen == null)
-                throw new ArgumentNullException("pen");
-
-            using (GraphicsPath path = RoundedRect(x, y, width, height, cornerRadius))
-            {
-                graphics.DrawPath(pen, path);
-            }
-        }
-        
     }
 }

VAR.PdfTools.Workbench/Properties/AssemblyInfo.cs

@@ -1,14 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("VAR.PdfTools.Workbench")]
-[assembly: AssemblyDescription("PdfTools Workbench")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("VAR")]
-[assembly: AssemblyProduct("VAR.PdfTools.Workbench")]
-[assembly: AssemblyCopyright("Copyright © VAR 2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
-[assembly: Guid("a5825d8e-9f81-49e0-b610-8ae5e46d02ea")]
-[assembly: AssemblyVersion("1.5.1.*")]

VAR.PdfTools.Workbench/Properties/PublishProfiles/FolderProfile.pubxml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>bin\Release\net5.0-windows\publish\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net5.0-windows</TargetFramework>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>True</PublishSingleFile>
+    <PublishReadyToRun>False</PublishReadyToRun>
+    <IncludeNativeLibrariesForSelfExtract>True</IncludeNativeLibrariesForSelfExtract>
+    <PublishTrimmed>True</PublishTrimmed>
+  </PropertyGroup>
+</Project>

VAR.PdfTools.Workbench/Properties/Settings.Designer.cs

@@ -1,74 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace VAR.PdfTools.Workbench.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
-                return defaultInstance;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("")]
-        public string LastPdfPath {
-            get {
-                return ((string)(this["LastPdfPath"]));
-            }
-            set {
-                this["LastPdfPath"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("")]
-        public string Field1 {
-            get {
-                return ((string)(this["Field1"]));
-            }
-            set {
-                this["Field1"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("")]
-        public string Field2 {
-            get {
-                return ((string)(this["Field2"]));
-            }
-            set {
-                this["Field2"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("")]
-        public string Field3 {
-            get {
-                return ((string)(this["Field3"]));
-            }
-            set {
-                this["Field3"] = value;
-            }
-        }
-    }
-}

VAR.PdfTools.Workbench/Properties/Settings.settings

@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="VAR.PdfTools.Workbench.Properties" GeneratedClassName="Settings">
-  <Profiles />
-  <Settings>
-    <Setting Name="LastPdfPath" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
-    </Setting>
-    <Setting Name="Field1" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
-    </Setting>
-    <Setting Name="Field2" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
-    </Setting>
-    <Setting Name="Field3" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
-    </Setting>
-  </Settings>
-</SettingsFile>

VAR.PdfTools.Workbench/VAR.PdfTools.Workbench.csproj

@@ -1,88 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.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')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{A5825D8E-9F81-49E0-B610-8AE5E46D02EA}</ProjectGuid>
+    <TargetFramework>net5.0-windows</TargetFramework>
     <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>VAR.PdfTools.Workbench</RootNamespace>
-    <AssemblyName>VAR.PdfTools.Workbench</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
   <PropertyGroup>
-    <StartupObject />
+    <PackageId>VAR.PdfTools.Workbench</PackageId>
+    <Title>VAR.PdfTools.Workbench</Title>
+    <Version>1.6.1</Version>
+    <Description>PdfTools Workbench</Description>
+    <Authors>VAR</Authors>
+    <Company>VAR</Company>
+    <Copyright>Copyright © VAR 2016-2019</Copyright>
+    <RequireLicenseAcceptance>false</RequireLicenseAcceptance>
+    <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
+    <PackageProjectUrl>https://github.com/Kableado/VAR.PdfTools</PackageProjectUrl>
+    <PackageTags>PDF;PDF Tool</PackageTags>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
+    <Content Include="..\LICENSE.txt" Link="LICENSE.txt" Pack="true" PackagePath="" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="FrmPdfInfo.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FrmPdfInfo.Designer.cs">
-      <DependentUpon>FrmPdfInfo.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <None Include="app.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
+    <ProjectReference Include="..\VAR.PdfTools\VAR.PdfTools.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\VAR.PdfTools\VAR.PdfTools.csproj">
-      <Project>{eb7e003a-6a95-4002-809f-926c7c8a11e9}</Project>
-      <Name>VAR.PdfTools</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="FrmPdfInfo.resx">
-      <DependentUpon>FrmPdfInfo.cs</DependentUpon>
-    </EmbeddedResource>
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>

VAR.PdfTools.Workbench/app.config

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="VAR.PdfTools.Workbench.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-        </sectionGroup>
-    </configSections>
-    <userSettings>
-        <VAR.PdfTools.Workbench.Properties.Settings>
-            <setting name="LastPdfPath" serializeAs="String">
-                <value />
-            </setting>
-            <setting name="Field1" serializeAs="String">
-                <value />
-            </setting>
-            <setting name="Field2" serializeAs="String">
-                <value />
-            </setting>
-            <setting name="Field3" serializeAs="String">
-                <value />
-            </setting>
-        </VAR.PdfTools.Workbench.Properties.Settings>
-    </userSettings>
-</configuration>

VAR.PdfTools.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31402.337
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VAR.PdfTools", "VAR.PdfTools\VAR.PdfTools.csproj", "{EB7E003A-6A95-4002-809F-926C7C8A11E9}"
 EndProject
@@ -19,10 +19,10 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{EB7E003A-6A95-4002-809F-926C7C8A11E9}.Debug|Any CPU.ActiveCfg = Debug .Net 4.6.1|Any CPU
-		{EB7E003A-6A95-4002-809F-926C7C8A11E9}.Debug|Any CPU.Build.0 = Debug .Net 4.6.1|Any CPU
-		{EB7E003A-6A95-4002-809F-926C7C8A11E9}.Release|Any CPU.ActiveCfg = Release .Net 4.6.1|Any CPU
-		{EB7E003A-6A95-4002-809F-926C7C8A11E9}.Release|Any CPU.Build.0 = Release .Net 4.6.1|Any CPU
+		{EB7E003A-6A95-4002-809F-926C7C8A11E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB7E003A-6A95-4002-809F-926C7C8A11E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB7E003A-6A95-4002-809F-926C7C8A11E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB7E003A-6A95-4002-809F-926C7C8A11E9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A5825D8E-9F81-49E0-B610-8AE5E46D02EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A5825D8E-9F81-49E0-B610-8AE5E46D02EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A5825D8E-9F81-49E0-B610-8AE5E46D02EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -31,4 +31,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {7E5F981A-8918-4C9E-AC9C-A798E2F3DA69}
+	EndGlobalSection
 EndGlobal

VAR.PdfTools/Build.NuGet.cmd

@@ -1,29 +0,0 @@
-@echo off
-
-:: MSBuild and tools path
-if exist "%windir%\Microsoft.Net\Framework\v4.0.30319" set MsBuildPath=%windir%\Microsoft.NET\Framework\v4.0.30319
-if exist "%windir%\Microsoft.Net\Framework64\v4.0.30319" set MsBuildPath=%windir%\Microsoft.NET\Framework64\v4.0.30319
-if exist "C:\Program Files (x86)\MSBuild\14.0\Bin" set MsBuildPath=C:\Program Files (x86)\MSBuild\14.0\Bin
-if exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin" set MsBuildPath=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin
-set PATH=%MsBuildPath%;%PATH%
-
-echo %MsBuildPath%
-
-:: NuGet
-set nuget="nuget"
-if exist "%~dp0..\packages\NuGet.CommandLine.3.4.3\tools\NuGet.exe" set nuget="%~dp0\..\packages\NuGet.CommandLine.3.4.3\tools\NuGet.exe"
-
-:: Release .Net 3.5
-Title Building Release .Net 3.5
-msbuild VAR.PdfTools.csproj /t:Build /p:Configuration="Release .Net 3.5" /p:Platform="AnyCPU"
-
-:: Release .Net 4.6.1
-Title Building Release .Net 4.6.1
-msbuild VAR.PdfTools.csproj /t:Build /p:Configuration="Release .Net 4.6.1" /p:Platform="AnyCPU"
-
-:: Packing Nuget
-Title Packing Nuget
-%nuget% pack VAR.PdfTools.csproj -Verbosity detailed -OutputDir "NuGet" -Properties Configuration="Release .Net 4.6.1" -Prop Platform=AnyCPU
-
-title Finished
-pause

VAR.PdfTools/Maths/Rect.cs

@@ -0,0 +1,19 @@
+namespace VAR.PdfTools.Maths
+{
+    public class Rect
+    {
+        public double XMin { get; set; }
+        public double XMax { get; set; }
+        public double YMin { get; set; }
+        public double YMax { get; set; }
+
+        public void Add(Rect rect)
+        {
+            if (rect.XMax > XMax) { XMax = rect.XMax; }
+            if (rect.YMax > YMax) { YMax = rect.YMax; }
+            if (rect.XMin < XMin) { XMin = rect.XMin; }
+            if (rect.YMin < YMin) { YMin = rect.YMin; }
+        }
+
+    }
+}

VAR.PdfTools/PdfDocument.cs

@@ -38,26 +38,50 @@ namespace VAR.PdfTools
         
         private static void ApplyFilterToStream(PdfStream stream, string filter)
         {
-            if (filter == "FlateDecode")
+            if(filter == "ASCIIHexDecode")
+            {
+                // TODO: Implement ASCIIHexDecode Filter
+            }
+            else if (filter == "ASCII85Decode" || filter == "A85")
+            {
+                // TODO: Implement ASCII85Decode Filter
+            }
+            else if (filter == "LZWDecode")
+            {
+                // TODO: Implement LZWDecode Filter
+            }
+            else if (filter == "FlateDecode")
             {
                 byte[] decodedStreamData = PdfFilters.FlateDecode.Decode(stream.Data);
                 stream.Data = decodedStreamData;
             }
-            else if (filter == "ASCII85Decode" || filter == "A85")
+            else if (filter == "RunLengthDecode")
             {
-                // FIXME: Implement this filter
+                // TODO: Implement RunLengthDecode Filter
             }
             else if (filter == "CCITTFaxDecode")
             {
-                // FIXME: Implement this filter
+                // TODO: Implement CCITTFaxDecode Filter
+            }
+            else if (filter == "JBIG2Decode")
+            {
+                // TODO: Implement JBIG2Decode Filter
             }
             else if (filter == "DCTDecode")
             {
-                // FIXME: Implement this filter
+                // TODO: Implement DCTDecode Filter
+            }
+            else if (filter == "JPXDecode")
+            {
+                // TODO: Implement JPXDecode Filter
+            }
+            else if (filter == "Crypt")
+            {
+                // TODO: Implement Crypt Filter
             }
             else
             {
-                // FIXME: Implement the rest of filters
+                // TODO: Handle unknown filters
             }
         }
 

VAR.PdfTools/PdfDocumentPage.cs

@@ -69,7 +69,8 @@ namespace VAR.PdfTools
             {
                 PdfParser parser = new PdfParser(_content);
                 _contentActions = parser.ParseContent();
-            }else
+            }
+            else
             {
                 _contentActions = new List<PdfContentAction>();
             }

VAR.PdfTools/PdfFont.cs

@@ -79,7 +79,7 @@ namespace VAR.PdfTools
 
         private void ParseSizes()
         {
-            double glyphSpaceToTextSpace = 1000.0; // FIXME: SubType:Type3 Uses a FontMatrix that may not correspond to 1/1000th
+            double glyphSpaceToTextSpace = 1000.0; // TODO: PdfFont.ParseSizes: SubType:Type3 Uses a FontMatrix that may not correspond to 1/1000th
             _widths = new Dictionary<char, double>();
             char firstChar = (char)_baseData.GetParamAsInt("FirstChar");
             char lastChar = (char)_baseData.GetParamAsInt("LastChar");
@@ -177,7 +177,7 @@ namespace VAR.PdfTools
         {
             if (_toUnicode == null)
             {
-                // FIXME: use standar tables
+                // TODO: PdfFont.ToUnicode: use standar tables
                 return new string(character, 1);
             }
 

VAR.PdfTools/PdfPageRenderer.cs

@@ -0,0 +1,210 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Imaging;
+using VAR.PdfTools.Maths;
+
+namespace VAR.PdfTools
+{
+    public class PdfPageRenderer
+    {
+        private PdfDocumentPage _page;
+        private PdfTextExtractor _pdfTextExtractor;
+        private Rect _pageRect;
+        private int _pageWidth;
+        private int _pageHeight;
+        private int _scale = 10;
+
+        private const int MaxSize = 10000;
+
+
+        public PdfTextExtractor Extractor { get { return _pdfTextExtractor; } }
+
+        public PdfPageRenderer(PdfDocumentPage page)
+        {
+            _page = page;
+            _pdfTextExtractor = new PdfTextExtractor(_page);
+            InitPage();
+        }
+
+        public PdfPageRenderer(PdfTextExtractor pdfTextExtractor)
+        {
+            _pdfTextExtractor = pdfTextExtractor;
+            _page = pdfTextExtractor.Page;
+            InitPage();
+        }
+
+        private void InitPage()
+        {
+            _pageRect = _pdfTextExtractor.GetRect();
+            _pageWidth = (int)Math.Ceiling(_pageRect.XMax - _pageRect.XMin);
+            _pageHeight = (int)Math.Ceiling(_pageRect.YMax - _pageRect.YMin);
+            while ((_pageWidth * _scale) > MaxSize) { _scale--; }
+            while ((_pageHeight * _scale) > MaxSize) { _scale--; }
+            if (_scale <= 0) { _scale = 1; }
+        }
+
+        public Bitmap Render()
+        {
+            if (_pdfTextExtractor.Elements.Count == 0)
+            {
+                // Nothing to render
+                Bitmap emptyBmp = new Bitmap(100, 200, PixelFormat.Format32bppArgb);
+                using (Graphics gcEmpty = Graphics.FromImage(emptyBmp))
+                    gcEmpty.Clear(Color.White);
+                return emptyBmp;
+            }
+
+            // Prepare image
+            Bitmap bmp = new Bitmap(_pageWidth * _scale, _pageHeight * _scale, PixelFormat.Format32bppArgb);
+            Graphics gc = Graphics.FromImage(bmp);
+            gc.Clear(Color.White);
+
+            // Draw text elements of the page
+            using (Pen penTextElem = new Pen(Color.Blue))
+            using (Pen penCharElem = new Pen(Color.Navy))
+            {
+                foreach (PdfTextElement textElement in _pdfTextExtractor.Elements)
+                {
+                    DrawTextElement(textElement, gc, penTextElem, penCharElem, _scale, _pageHeight, _pageRect.XMin, _pageRect.YMin, Brushes.Black);
+                }
+            }
+
+            gc.Dispose();
+            return bmp;
+        }
+
+        public Bitmap RenderColumn(PdfTextElementColumn columnData, Bitmap bmp = null)
+        {
+            Graphics gc;
+            if (bmp == null)
+            {
+                bmp = new Bitmap(_pageWidth * _scale, _pageHeight * _scale, PixelFormat.Format32bppArgb);
+                gc = Graphics.FromImage(bmp);
+                gc.Clear(Color.White);
+            }
+            else
+            {
+                gc = Graphics.FromImage(bmp);
+            }
+
+            // Draw text elements of the column header
+            using (Pen penTextElem = new Pen(Color.Green))
+            using (Pen penCharElem = new Pen(Color.DarkGreen))
+            {
+                DrawTextElement(columnData.HeadTextElement, gc, penTextElem, penCharElem, _scale, _pageHeight, _pageRect.XMin, _pageRect.YMin, Brushes.Olive);
+            }
+
+            // Draw text elements of the column
+            using (Pen penTextElem = new Pen(Color.Red))
+            using (Pen penCharElem = new Pen(Color.DarkRed))
+            {
+                foreach (PdfTextElement textElement in columnData.Elements)
+                {
+                    DrawTextElement(textElement, gc, penTextElem, penCharElem, _scale, _pageHeight, _pageRect.XMin, _pageRect.YMin, Brushes.OrangeRed);
+                }
+            }
+
+            // Draw column extents
+            using (Pen penColumn = new Pen(Color.Red))
+            {
+                float y = (float)(_pageRect.YMax - columnData.Y);
+                float x1 = (float)(columnData.X1 - _pageRect.XMin);
+                float x2 = (float)(columnData.X2 - _pageRect.XMin);
+
+                gc.DrawLine(penColumn, x1 * _scale, y * _scale, x2 * _scale, y * _scale);
+                gc.DrawLine(penColumn, x1 * _scale, y * _scale, x1 * _scale, _pageHeight * _scale);
+                gc.DrawLine(penColumn, x2 * _scale, y * _scale, x2 * _scale, _pageHeight * _scale);
+            }
+
+            gc.Dispose();
+            return bmp;
+        }
+
+        private static void DrawTextElement(PdfTextElement textElement, Graphics gc, Pen penTextElem, Pen penCharElem, int scale, int pageHeight, double pageXMin, double pageYMin, Brush brushText)
+        {
+            if (textElement == null) { return; }
+            double textElementX = textElement.GetX() - pageXMin;
+            double textElementY = textElement.GetY() - pageYMin;
+            double textElementWidth = textElement.VisibleWidth;
+            double textElementHeight = textElement.VisibleHeight;
+            string textElementText = textElement.VisibleText;
+            string textElementFontName = (textElement.Font == null ? string.Empty : textElement.Font.Name);
+
+            if (textElementHeight < 0.0001) { return; }
+
+            double textElementPageX = textElementX;
+            double textElementPageY = pageHeight - textElementY;
+
+            if (penTextElem != null)
+            {
+                DrawRoundedRectangle(gc, penTextElem,
+                    (int)(textElementPageX * scale),
+                    (int)(textElementPageY * scale),
+                    (int)(textElementWidth * scale),
+                    (int)(textElementHeight * scale),
+                    5);
+            }
+
+            using (Font font = new Font("Arial", (int)(textElementHeight * scale), GraphicsUnit.Pixel))
+            {
+                foreach (PdfCharElement c in textElement.Characters)
+                {
+                    gc.DrawString(c.Char,
+                        font,
+                        brushText,
+                        (int)((textElementPageX + c.Displacement) * scale),
+                        (int)(textElementPageY * scale));
+                    if (penCharElem != null)
+                    {
+                        DrawRoundedRectangle(gc, penCharElem,
+                            (int)((textElementPageX + c.Displacement) * scale),
+                            (int)(textElementPageY * scale),
+                            (int)(c.Width * scale),
+                            (int)(textElementHeight * scale),
+                            5);
+                    }
+                }
+            }
+        }
+
+        public static GraphicsPath RoundedRect(int x, int y, int width, int height, int radius)
+        {
+            int diameter = radius * 2;
+            Size size = new Size(diameter, diameter);
+            Rectangle arc = new Rectangle(x, y, diameter, diameter);
+            GraphicsPath path = new GraphicsPath();
+
+            // top left arc 
+            path.AddArc(arc, 180, 90);
+
+            // top right arc  
+            arc.X = (x + width) - diameter;
+            path.AddArc(arc, 270, 90);
+
+            // bottom right arc  
+            arc.Y = (y + height) - diameter;
+            path.AddArc(arc, 0, 90);
+
+            // bottom left arc 
+            arc.X = x;
+            path.AddArc(arc, 90, 90);
+
+            path.CloseFigure();
+            return path;
+        }
+
+        public static void DrawRoundedRectangle(Graphics graphics, Pen pen, int x, int y, int width, int height, int cornerRadius)
+        {
+            if (graphics == null)
+                throw new ArgumentNullException("graphics");
+            if (pen == null)
+                throw new ArgumentNullException("pen");
+
+            using (GraphicsPath path = RoundedRect(x, y, width, height, cornerRadius))
+            {
+                graphics.DrawPath(pen, path);
+            }
+        }
+    }
+}

VAR.PdfTools/PdfParser.cs

@@ -852,7 +852,7 @@ namespace VAR.PdfTools
                     string token = ParseToken();
                     if (token == "startxref")
                     {
-                        // FIXME: Ignoring startxref for now
+                        // TODO: PdfParser: Ignoring startxref for now
                         SkipEndOfLine();
                         SkipToEndOfLine();
                         SkipEndOfLine();
@@ -863,7 +863,7 @@ namespace VAR.PdfTools
                     }
                     if (token == "xref")
                     {
-                        // FIXME: Ignoring xref for now
+                        // TODO: PdfParser: Ignoring xref for now
                         SkipToEndOfLine();
                         SkipEndOfLine();
                         do
@@ -891,7 +891,7 @@ namespace VAR.PdfTools
                     }
                     if (token == "trailer")
                     {
-                        // FIXME: Ignoring trailer for now
+                        // TODO: PdfParser: Ignoring trailer for now
                         SkipEndOfLine();
                         ParseElement();
                         SkipWhitespace();

VAR.PdfTools/PdfTextElement.cs

@@ -0,0 +1,149 @@
+using System.Collections.Generic;
+using System.Linq;
+using VAR.PdfTools.Maths;
+
+namespace VAR.PdfTools
+{
+    public struct PdfCharElement
+    {
+        public string Char;
+        public double Displacement;
+        public double Width;
+    }
+
+    public class PdfTextElement
+    {
+        #region Properties
+
+        public PdfFont Font { get; set; }
+
+        public double FontSize { get; set; }
+
+        public Matrix3x3 Matrix { get; set; }
+
+        public string RawText { get; set; }
+
+        public string VisibleText { get; set; }
+
+        public double VisibleWidth { get; set; }
+
+        public double VisibleHeight { get; set; }
+
+        public List<PdfCharElement> Characters { get; set; }
+
+        public List<PdfTextElement> Childs { get; set; }
+
+        #endregion
+
+        #region Public methods
+
+        public double GetX()
+        {
+            return Matrix.Matrix[0, 2];
+        }
+
+        public double GetY()
+        {
+            return Matrix.Matrix[1, 2];
+        }
+
+        public PdfTextElement SubPart(int startIndex, int endIndex)
+        {
+            PdfTextElement blockElem = new PdfTextElement
+            {
+                Font = null,
+                FontSize = FontSize,
+                Matrix = Matrix.Copy(),
+                RawText = RawText.Substring(startIndex, endIndex - startIndex),
+                VisibleText = VisibleText.Substring(startIndex, endIndex - startIndex),
+                VisibleWidth = 0,
+                VisibleHeight = VisibleHeight,
+                Characters = new List<PdfCharElement>(),
+                Childs = new List<PdfTextElement>(),
+            };
+            double displacement = Characters[startIndex].Displacement;
+            blockElem.Matrix.Matrix[0, 2] += displacement;
+            for (int j = startIndex; j < endIndex; j++)
+            {
+                blockElem.Characters.Add(new PdfCharElement
+                {
+                    Char = Characters[j].Char,
+                    Displacement = Characters[j].Displacement - displacement,
+                    Width = Characters[j].Width,
+                });
+            }
+            PdfCharElement lastChar = blockElem.Characters[blockElem.Characters.Count - 1];
+            blockElem.VisibleWidth = lastChar.Displacement + lastChar.Width;
+            foreach (PdfTextElement elem in Childs)
+            {
+                blockElem.Childs.Add(elem);
+            }
+
+            return blockElem;
+        }
+
+        public double MaxWidth()
+        {
+            return Characters.Average(c => c.Width);
+        }
+
+        public Rect GetRect()
+        {
+            double x = GetX();
+            double y = GetY();
+            return new Rect
+            {
+                XMin = x,
+                YMax = y,
+                XMax = x + VisibleWidth,
+                YMin = y - VisibleHeight,
+            };
+        }
+
+        public double GetCharacterPreviousSpacing(int index)
+        {
+            if (index <= 0) { return 0; }
+            double previousEnd = Characters[index - 1].Displacement + Characters[index - 1].Width;
+            double spacing = Characters[index].Displacement - previousEnd;
+            return spacing;
+        }
+
+        public double GetCharacterPrecedingSpacing(int index)
+        {
+            if (index >= (Characters.Count - 1)) { return 0; }
+            double currentEnd = Characters[index].Displacement + Characters[index].Width;
+            double spacing = Characters[index + 1].Displacement - currentEnd;
+            return spacing;
+        }
+
+        #endregion
+    }
+
+    public class PdfTextElementColumn
+    {
+        public PdfTextElement HeadTextElement { get; private set; }
+
+        public IEnumerable<PdfTextElement> Elements { get; private set; }
+
+        public double Y { get; private set; }
+
+        public double X1 { get; private set; }
+        public double X2 { get; private set; }
+
+        public static PdfTextElementColumn Empty { get; } = new PdfTextElementColumn();
+
+        private PdfTextElementColumn()
+        {
+            Elements = new List<PdfTextElement>();
+        }
+
+        public PdfTextElementColumn(PdfTextElement head, IEnumerable<PdfTextElement> elements, double y, double x1, double x2)
+        {
+            HeadTextElement = head;
+            Elements = elements;
+            Y = y;
+            X1 = x1;
+            X2 = x2;
+        }
+    }
+}

VAR.PdfTools/PdfTextExtractor.cs

@@ -7,92 +7,6 @@ using VAR.PdfTools.PdfElements;
 
 namespace VAR.PdfTools
 {
-    public struct PdfCharElement
-    {
-        public string Char;
-        public double Displacement;
-        public double Width;
-    }
-
-    public class PdfTextElement
-    {
-        #region Properties
-
-        public PdfFont Font { get; set; }
-
-        public double FontSize { get; set; }
-
-        public Matrix3x3 Matrix { get; set; }
-
-        public string RawText { get; set; }
-
-        public string VisibleText { get; set; }
-
-        public double VisibleWidth { get; set; }
-
-        public double VisibleHeight { get; set; }
-
-        public List<PdfCharElement> Characters { get; set; }
-
-        public List<PdfTextElement> Childs { get; set; }
-
-        #endregion
-
-        #region Public methods
-
-        public double GetX()
-        {
-            return Matrix.Matrix[0, 2];
-        }
-
-        public double GetY()
-        {
-            return Matrix.Matrix[1, 2];
-        }
-
-        public PdfTextElement SubPart(int startIndex, int endIndex)
-        {
-            PdfTextElement blockElem = new PdfTextElement
-            {
-                Font = null,
-                FontSize = FontSize,
-                Matrix = Matrix.Copy(),
-                RawText = RawText.Substring(startIndex, endIndex - startIndex),
-                VisibleText = VisibleText.Substring(startIndex, endIndex - startIndex),
-                VisibleWidth = 0,
-                VisibleHeight = VisibleHeight,
-                Characters = new List<PdfCharElement>(),
-                Childs = new List<PdfTextElement>(),
-            };
-            double displacement = Characters[startIndex].Displacement;
-            blockElem.Matrix.Matrix[0, 2] += displacement;
-            for (int j = startIndex; j < endIndex; j++)
-            {
-                blockElem.Characters.Add(new PdfCharElement
-                {
-                    Char = Characters[j].Char,
-                    Displacement = Characters[j].Displacement - displacement,
-                    Width = Characters[j].Width,
-                });
-            }
-            PdfCharElement lastChar = blockElem.Characters[blockElem.Characters.Count - 1];
-            blockElem.VisibleWidth = lastChar.Displacement + lastChar.Width;
-            foreach (PdfTextElement elem in Childs)
-            {
-                blockElem.Childs.Add(elem);
-            }
-
-            return blockElem;
-        }
-
-        public double MaxWidth()
-        {
-            return Characters.Average(c => c.Width) / 2;
-        }
-
-        #endregion
-    }
-
     public class PdfTextExtractor
     {
         #region Declarations
@@ -256,6 +170,14 @@ namespace VAR.PdfTools
             return list;
         }
 
+        private bool TextElementVerticalIntersection(PdfTextElement elem1, double elem2X1, double elem2X2)
+        {
+            double elem1X1 = elem1.GetX();
+            double elem1X2 = elem1.GetX() + elem1.VisibleWidth;
+
+            return elem1X2 >= elem2X1 && elem2X2 >= elem1X1;
+        }
+
         private bool TextElementVerticalIntersection(PdfTextElement elem1, PdfTextElement elem2)
         {
             double elem1X1 = elem1.GetX();
@@ -448,7 +370,7 @@ namespace VAR.PdfTools
                 }
                 else if (action.Token == "Tz")
                 {
-                    // FIXME: Horizontal Scale
+                    // TODO: PdfTextExtractor: Horizontal Scale
                 }
                 else if (action.Token == "Tf")
                 {
@@ -463,11 +385,11 @@ namespace VAR.PdfTools
                 }
                 else if (action.Token == "Tr")
                 {
-                    // FIXME: Rendering mode
+                    // TODO: PdfTextExtractor: Rendering mode
                 }
                 else if (action.Token == "Ts")
                 {
-                    // FIXME: Text rise
+                    // TODO: PdfTextExtractor: Text rise
                 }
                 else if (action.Token == "Td")
                 {
@@ -522,82 +444,82 @@ namespace VAR.PdfTools
                 }
                 else if (action.Token == "re")
                 {
-                    // FIXME: Interpret this
+                    // TODO: PdfTextExtractor: Interpret this
                 }
                 else if (action.Token == "f")
                 {
-                    // FIXME: Interpret this
+                    // TODO: PdfTextExtractor: Interpret this
                 }
                 else if (action.Token == "g")
                 {
-                    // FIXME: Interpret this
+                    // TODO: PdfTextExtractor: Interpret this
                 }
                 else if (action.Token == "rg")
                 {
-                    // FIXME: Interpret this
+                    // TODO: PdfTextExtractor: Interpret this
                 }
                 else if (action.Token == "BI")
                 {
-                    // FIXME: Interpret this
+                    // TODO: PdfTextExtractor: Interpret this
                 }
                 else if (action.Token == "ID")
                 {
-                    // FIXME: Interpret this
+                    // TODO: PdfTextExtractor: Interpret this
                 }
                 else if (action.Token == "EI")
                 {
-                    // FIXME: Interpret this
+                    // TODO: PdfTextExtractor: Interpret this
                 }
                 else if (action.Token == "W")
                 {
-                    // FIXME: Interpret this
+                    // TODO: PdfTextExtractor: Interpret this
                 }
                 else if (action.Token == "n")
                 {
-                    // FIXME: Interpret this
+                    // TODO: PdfTextExtractor: Interpret this
                 }
                 else if (action.Token == "Do")
                 {
-                    // FIXME: Interpret this
+                    // TODO: PdfTextExtractor: Interpret this
                 }
                 else if (action.Token == "m")
                 {
-                    // FIXME: Interpret this "moveto: Begin new subpath"
+                    // TODO: PdfTextExtractor: Interpret this "moveto: Begin new subpath"
                 }
                 else if (action.Token == "l")
                 {
-                    // FIXME: Interpret this "lineto: Append straight line segment to path"
+                    // TODO: PdfTextExtractor: Interpret this "lineto: Append straight line segment to path"
                     lineCount++;
                 }
                 else if (action.Token == "h")
                 {
-                    // FIXME: Interpret this "closepath: Close subpath"
+                    // TODO: PdfTextExtractor: Interpret this "closepath: Close subpath"
                     pathCount++;
                 }
                 else if (action.Token == "W")
                 {
-                    // FIXME: Interpret this "clip: Set clipping path using nonzero winding number rule"
+                    // TODO: PdfTextExtractor: Interpret this "clip: Set clipping path using nonzero winding number rule"
                 }
                 else if (action.Token == "W*")
                 {
-                    // FIXME: Interpret this "eoclip: Set clipping path using even-odd rule"
+                    // TODO: PdfTextExtractor: Interpret this "eoclip: Set clipping path using even-odd rule"
                 }
                 else if (action.Token == "w")
                 {
-                    // FIXME: Interpret this "setlinewidth: Set line width"
+                    // TODO: PdfTextExtractor: Interpret this "setlinewidth: Set line width"
                 }
                 else if (action.Token == "G")
                 {
-                    // FIXME: Interpret this "setgray: Set gray level for stroking operations"
+                    // TODO: PdfTextExtractor: Interpret this "setgray: Set gray level for stroking operations"
                 }
                 else if (action.Token == "S")
                 {
-                    // FIXME: Interpret this "stroke: Stroke path"
+                    // TODO: PdfTextExtractor: Interpret this "stroke: Stroke path"
                     strokeCount++;
                 }
                 else if (action.Token == "M")
                 {
-                    // FIXME: Interpret this "setmiterlimit: Set miter limit"
+                    // TODO: PdfTextExtractor: Interpret this "setmiterlimit: Set miter limit"
                 }
                 else
                 {
@@ -738,19 +660,26 @@ namespace VAR.PdfTools
 
         #region Public methods
 
-        public List<string> GetColumn(string column)
+        public Rect GetRect()
         {
-            return GetColumn(column, true);
+            Rect rect = null;
+            foreach (PdfTextElement textElement in _textElements)
+            {
+                Rect elementRect = textElement.GetRect();
+                if (rect == null) { rect = elementRect; }
+                rect.Add(elementRect);
+            }
+            return rect;
         }
 
-        public List<string> GetColumn(string column, bool fuzzy)
+        public PdfTextElementColumn GetColumn(string column, bool fuzzy = true)
         {
             PdfTextElement columnHead = FindElementByText(column, fuzzy);
             if (columnHead == null)
             {
-                return new List<string>();
+                return PdfTextElementColumn.Empty;
             }
-            double headY = columnHead.GetY();
+            double headY = columnHead.GetY() - columnHead.VisibleHeight;
             double headX1 = columnHead.GetX();
             double headX2 = headX1 + columnHead.VisibleWidth;
 
@@ -778,14 +707,20 @@ namespace VAR.PdfTools
                         extentX2 = elemX1;
                     }
                 }
-
             }
 
+            PdfTextElementColumn columnData = GetColumn(columnHead, headY, headX1, headX2, extentX1, extentX2);
+
+            return columnData;
+        }
+
+        public PdfTextElementColumn GetColumn(PdfTextElement columnHead, double headY, double headX1, double headX2, double extentX1, double extentX2)
+        {
             // Get all the elements that intersects vertically, are down and sort results
             var columnDataRaw = new List<PdfTextElement>();
             foreach (PdfTextElement elem in _textElements)
             {
-                if (TextElementVerticalIntersection(columnHead, elem) == false) { continue; }
+                if (TextElementVerticalIntersection(elem, headX1, headX2) == false) { continue; }
 
                 // Only intems down the column
                 double elemY = elem.GetY();
@@ -795,32 +730,94 @@ namespace VAR.PdfTools
             }
             columnDataRaw = columnDataRaw.OrderByDescending(elem => elem.GetY()).ToList();
 
-            // Only items completelly inside extents, amd break on the first element outside
-            var columnData = new List<PdfTextElement>();
+            // Only items completelly inside extents, try spliting big elements and break on big elements that can't be splitted
+            var columnElements = new List<PdfTextElement>();
             foreach (PdfTextElement elem in columnDataRaw)
             {
                 double elemX1 = elem.GetX();
                 double elemX2 = elemX1 + elem.VisibleWidth;
-                if (elemX1 < extentX1 || elemX2 > extentX2) { break; }
 
-                columnData.Add(elem);
+                // Add elements completely inside
+                if (elemX1 > extentX1 && elemX2 < extentX2)
+                {
+                    columnElements.Add(elem);
+                    continue;
                 }
 
+                // Try to split elements intersecting extents of the column
+                double maxSpacing = elem.Characters.Average(c => c.Width) / 10;
+                int indexStart = 0;
+                int indexEnd = elem.Characters.Count - 1;
+                bool indexStartValid = true;
+                bool indexEndValid = true;
+                if (elemX1 < extentX1)
+                {
+                    // Search best start
+                    int index = 0;
+                    double characterPosition = elemX1 + elem.Characters[index].Displacement;
+                    while (characterPosition < extentX1 && index < (elem.Characters.Count - 1))
+                    {
+                        index++;
+                        characterPosition = elemX1 + elem.Characters[index].Displacement;
+                    }
+                    double spacing = elem.GetCharacterPreviousSpacing(index);
+                    while (spacing < maxSpacing && index < (elem.Characters.Count - 1))
+                    {
+                        index++;
+                        spacing = elem.GetCharacterPreviousSpacing(index);
+                    }
+                    if (spacing < maxSpacing) { indexStartValid = false; }
+                    indexStart = index;
+                }
+
+                if (elemX2 > extentX2)
+                {
+                    // Search best end
+                    int index = elem.Characters.Count - 1;
+                    double characterPosition = elemX1 + elem.Characters[index].Displacement + elem.Characters[index].Width;
+                    while (characterPosition > extentX2 && index > 0)
+                    {
+                        index--;
+                        characterPosition = elemX1 + elem.Characters[index].Displacement + elem.Characters[index].Width;
+                    }
+                    double spacing = elem.GetCharacterPrecedingSpacing(index);
+                    while (spacing < maxSpacing && index > 0)
+                    {
+                        index--;
+                        spacing = elem.GetCharacterPrecedingSpacing(index);
+                    }
+                    if (spacing < maxSpacing) { indexEndValid = false; }
+                    indexEnd = index;
+                }
+
+                // Break when there is no good split, spaning all extent
+                if (indexStartValid == false && indexEndValid == false) { break; }
+
+                // Continue when only one of the sides is invalid. (outside elements intersecting extents of the column)
+                if (indexStartValid == false || indexEndValid == false) { continue; }
+
+                // Add splitted element
+                columnElements.Add(elem.SubPart(indexStart, indexEnd + 1));
+            }
+
+            var columnData = new PdfTextElementColumn(columnHead, columnElements, headY, extentX1, extentX2);
+            return columnData;
+        }
+
+        public List<string> GetColumnAsStrings(string column, bool fuzzy = true)
+        {
+            PdfTextElementColumn columnData = GetColumn(column, fuzzy);
+
             // Emit result
             var result = new List<string>();
-            foreach (PdfTextElement elem in columnData)
+            foreach (PdfTextElement elem in columnData.Elements)
             {
                 result.Add(elem.VisibleText);
             }
             return result;
         }
 
-        public string GetField(string field)
-        {
-            return GetField(field, true);
-        }
-
-        public string GetField(string field, bool fuzzy)
+        public string GetFieldAsString(string field, bool fuzzy = true)
         {
             PdfTextElement fieldTitle = FindElementByText(field, fuzzy);
             if (fieldTitle == null)
@@ -848,12 +845,7 @@ namespace VAR.PdfTools
             return fieldData.OrderBy(elem => elem.GetX()).FirstOrDefault().VisibleText;
         }
 
-        public bool HasText(string text)
-        {
-            return HasText(text, true);
-        }
-
-        public bool HasText(string text, bool fuzzy)
+        public bool HasText(string text, bool fuzzy = true)
         {
             List<PdfTextElement> list = FindElementsContainingText(text, fuzzy);
             return (list.Count > 0);

VAR.PdfTools/Properties/AssemblyInfo.cs

@@ -1,14 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("VAR.PdfTools")]
-[assembly: AssemblyDescription("PdfTools Library")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("VAR")]
-[assembly: AssemblyProduct("VAR.PdfTools")]
-[assembly: AssemblyCopyright("Copyright © VAR 2016-2019")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
-[assembly: Guid("eb7e003a-6a95-4002-809f-926c7c8a11e9")]
-[assembly: AssemblyVersion("1.5.2.*")]

VAR.PdfTools/VAR.PdfTools.csproj

@@ -1,105 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.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')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{EB7E003A-6A95-4002-809F-926C7C8A11E9}</ProjectGuid>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>VAR.PdfTools</RootNamespace>
-    <AssemblyName>VAR.PdfTools</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
+    <IsPackable>true</IsPackable>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug .Net 4.6.1|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\net461</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release .Net 4.6.1|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\net461</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug .Net 3.5|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\net35</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release .Net 3.5|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\net35</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+  <PropertyGroup>
+    <PackageId>VAR.PdfTools</PackageId>
+    <Title>VAR.PdfTools</Title>
+    <Version>1.6.1</Version>
+    <Description>PdfTools Library</Description>
+    <Authors>VAR</Authors>
+    <Company>VAR</Company>
+    <Copyright>Copyright © VAR 2016-2019</Copyright>
+    <RequireLicenseAcceptance>false</RequireLicenseAcceptance>
+    <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
+    <PackageProjectUrl>https://github.com/Kableado/VAR.PdfTools</PackageProjectUrl>
+    <PackageTags>PDF;PDF Library</PackageTags>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
+    <Content Include="..\LICENSE.txt" Link="LICENSE.txt" Pack="true" PackagePath="" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Maths\Matrix3x3.cs" />
-    <Compile Include="PdfContentAction.cs" />
-    <Compile Include="PdfDocument.cs" />
-    <Compile Include="PdfDocumentPage.cs" />
-    <Compile Include="PdfElements\IPdfElement.cs" />
-    <Compile Include="PdfElements\PdfArray.cs" />
-    <Compile Include="PdfElements\PdfBoolean.cs" />
-    <Compile Include="PdfElements\PdfDictionary.cs" />
-    <Compile Include="PdfElements\PdfElementTypes.cs" />
-    <Compile Include="PdfElements\PdfElementUtils.cs" />
-    <Compile Include="PdfFilters.cs" />
-    <Compile Include="PdfFont.cs" />
-    <Compile Include="PdfElements\PdfInteger.cs" />
-    <Compile Include="PdfElements\PdfName.cs" />
-    <Compile Include="PdfElements\PdfNull.cs" />
-    <Compile Include="PdfElements\PdfObject.cs" />
-    <Compile Include="PdfElements\PdfObjectReference.cs" />
-    <Compile Include="PdfElements\PdfReal.cs" />
-    <Compile Include="PdfElements\PdfStream.cs" />
-    <Compile Include="PdfElements\PdfString.cs" />
-    <Compile Include="PdfParser.cs" />
-    <Compile Include="PdfStandar14FontMetrics.cs" />
-    <Compile Include="PdfTextExtractor.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Maths\Vector3D.cs" />
+    <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="NuGet\keep.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Build.NuGet.cmd" />
-    <None Include="packages.config" />
-    <None Include="VAR.PdfTools.nuspec" />
-  </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.
-  <Target Name="BeforeBuild">
+  <Target Name="CopyPackage" AfterTargets="Pack">
+    <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="Nuget\" />
   </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>

VAR.PdfTools/VAR.PdfTools.nuspec

@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>$id$</id>
-    <version>$version$</version>
-    <title>$title$</title>
-    <authors>$author$</authors>
-    <owners>$author$</owners>
-    <licenseUrl>https://github.com/Kableado/VAR.PdfTools/blob/master/LICENSE.txt</licenseUrl>
-    <projectUrl>https://github.com/Kableado/VAR.PdfTools</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>$description$</description>
-    <copyright>Copyright VAR 2016-2017</copyright>
-    <tags>PDF Library</tags>
-  </metadata>
-  <files>
-    <file src="bin\Release\net461\VAR.PdfTools.dll" target="lib\net461\VAR.PdfTools.dll" />
-    <file src="bin\Release\net461\VAR.PdfTools.pdb" target="lib\net461\VAR.PdfTools.pdb" />
-    <file src="bin\Release\net35\VAR.PdfTools.dll" target="lib\net35\VAR.PdfTools.dll" />
-    <file src="bin\Release\net35\VAR.PdfTools.pdb" target="lib\net35\VAR.PdfTools.pdb" />
-  </files>
-</package>

VAR.PdfTools/packages.config

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NuGet.CommandLine" version="3.4.3" targetFramework="net461" developmentDependency="true" />
-</packages>