Bump version 1.5.2

.gitignore

@@ -27,3 +27,5 @@ obj/
 _ReSharper*/
 *.userprefs
 *.nupkg
+
+.vs

LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016-2017 Valeriano Alfonso Rodriguez
+Copyright (c) 2016-2019 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

VAR.PdfTools.Workbench/Properties/AssemblyInfo.cs

@@ -11,4 +11,4 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("a5825d8e-9f81-49e0-b610-8ae5e46d02ea")]
-[assembly: AssemblyVersion("1.5.0.*")]
+[assembly: AssemblyVersion("1.5.1.*")]

VAR.PdfTools/PdfTextExtractor.cs

@@ -33,7 +33,7 @@ namespace VAR.PdfTools
         public double VisibleHeight { get; set; }
 
         public List<PdfCharElement> Characters { get; set; }
-        
+
         public List<PdfTextElement> Childs { get; set; }
 
         #endregion
@@ -85,6 +85,11 @@ namespace VAR.PdfTools
             return blockElem;
         }
 
+        public double MaxWidth()
+        {
+            return Characters.Average(c => c.Width) / 2;
+        }
+
         #endregion
     }
 
@@ -134,7 +139,7 @@ namespace VAR.PdfTools
             JoinTextElements();
             SplitTextElements();
         }
-        
+
         #endregion
 
         #region Utility methods
@@ -290,7 +295,7 @@ namespace VAR.PdfTools
             _graphicsMatrix = _graphicsMatrixStack[_graphicsMatrixStack.Count - 1];
             _graphicsMatrixStack.RemoveAt(_graphicsMatrixStack.Count - 1);
         }
-        
+
         private void OpBeginText()
         {
             _textMatrix.Idenity();
@@ -310,7 +315,7 @@ namespace VAR.PdfTools
             _font = _page.Fonts[fontName];
             _fontSize = size;
         }
-        
+
         private void OpTextCharSpacing(double charSpacing)
         {
             _charSpacing = charSpacing;
@@ -622,13 +627,22 @@ namespace VAR.PdfTools
                 while (i < _textElements.Count)
                 {
                     PdfTextElement neighbour = _textElements[i];
+
+                    if (neighbour.Font != elem.Font || neighbour.FontSize != elem.FontSize)
+                    {
+                        i++;
+                        continue;
+                    }
+
                     double neighbourY = neighbour.GetY();
                     if (Math.Abs(neighbourY - blockY) > 0.001) { i++; continue; }
 
+                    double maxWidth = neighbour.MaxWidth();
+
                     double neighbourXMin = neighbour.GetX();
                     double neighbourXMax = neighbourXMin + neighbour.VisibleWidth;
-                    double auxBlockXMin = blockXMin - (elem.FontSize * elem.Font.GetCharWidth('m'));
+                    double auxBlockXMin = blockXMin - maxWidth;
-                    double auxBlockXMax = blockXMax + (elem.FontSize * elem.Font.GetCharWidth('m'));
+                    double auxBlockXMax = blockXMax + maxWidth;
                     if (auxBlockXMax >= neighbourXMin && neighbourXMax >= auxBlockXMin)
                     {
                         _textElements.Remove(neighbour);
@@ -640,8 +654,8 @@ namespace VAR.PdfTools
                     }
                     i++;
                 }
-                
+
-                if(textElementNeighbours.Count == 0)
+                if (textElementNeighbours.Count == 1)
                 {
                     textElementsCondensed.Add(elem);
                     continue;
@@ -652,7 +666,7 @@ namespace VAR.PdfTools
                 foreach (PdfTextElement neighbour in textElementNeighbours)
                 {
                     double neighbourXMin = neighbour.GetX();
-                    foreach(PdfCharElement c in neighbour.Characters)
+                    foreach (PdfCharElement c in neighbour.Characters)
                     {
                         chars.Add(new PdfCharElement
                         {
@@ -664,7 +678,7 @@ namespace VAR.PdfTools
                 }
                 chars = chars.OrderBy(c => c.Displacement).ToList();
                 var sbText = new StringBuilder();
-                foreach(PdfCharElement c in chars)
+                foreach (PdfCharElement c in chars)
                 {
                     sbText.Append(c.Char);
                 }
@@ -685,7 +699,7 @@ namespace VAR.PdfTools
             }
             _textElements = textElementsCondensed;
         }
-        
+
         private void SplitTextElements()
         {
             var textElementsSplitted = new List<PdfTextElement>();
@@ -693,13 +707,15 @@ namespace VAR.PdfTools
             {
                 PdfTextElement elem = _textElements[0];
                 _textElements.Remove(elem);
-                
+
+                double maxWidth = elem.MaxWidth();
+
                 int prevBreak = 0;
                 for (int i = 1; i < elem.Characters.Count; i++)
                 {
                     double prevCharEnd = elem.Characters[i - 1].Displacement + elem.Characters[i - 1].Width;
                     double charSeparation = elem.Characters[i].Displacement - prevCharEnd;
-                    if (charSeparation > (elem.Characters[i - 1].Width * 2))
+                    if (charSeparation > maxWidth)
                     {
                         PdfTextElement partElem = elem.SubPart(prevBreak, i);
                         textElementsSplitted.Add(partElem);

VAR.PdfTools/Properties/AssemblyInfo.cs

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