Merge branch 'dev' to 'master'

Changelog.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## v2.5.0
+
+---
+Release Date: **22.07.2024**
+
+- Adapted handling of the font scheme in styles. The scheme is now determined automatically
+- Added column option to define a default column style
+- Added tests
+
 ## v2.4.0
 
 ---

Demo .NET Standard/Demo .NET Standard.csproj

@@ -21,11 +21,11 @@
 
     <StartupObject>Demo.Program</StartupObject>
 
-    <Version>2.4.0</Version>
+    <Version>2.5.0</Version>
 
-    <AssemblyVersion>2.4.0.0</AssemblyVersion>
+    <AssemblyVersion>2.5.0.0</AssemblyVersion>
 
-    <FileVersion>2.4.0.0</FileVersion>
+    <FileVersion>2.5.0.0</FileVersion>
 
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
 

Demo/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.4.0.0")]
-[assembly: AssemblyFileVersion("2.4.0.0")]
+[assembly: AssemblyVersion("2.5.0.0")]
+[assembly: AssemblyFileVersion("2.5.0.0")]

NanoXLSX .NET Standard/NanoXLSX .NET Standard.csproj

@@ -28,9 +28,9 @@
     <PackageLicenseFile></PackageLicenseFile>
     <PackageReleaseNotes>Please see https://github.com/rabanti-github/NanoXLSX/blob/master/Changelog.md for the release notes</PackageReleaseNotes>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <AssemblyVersion>2.4.0.0</AssemblyVersion>
-    <FileVersion>2.4.0.0</FileVersion>
-    <Version>2.4.0</Version>
+    <AssemblyVersion>2.5.0.0</AssemblyVersion>
+    <FileVersion>2.5.0.0</FileVersion>
+    <Version>2.5.0</Version>
     <RepositoryType>git</RepositoryType>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

NanoXLSX/Properties/AssemblyInfo.cs

@@ -28,5 +28,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.4.0")]
-[assembly: AssemblyFileVersion("2.4.0")]
+[assembly: AssemblyVersion("2.5.0")]
+[assembly: AssemblyFileVersion("2.5.0")]

NanoXlsx Test/NanoXLSX Test.csproj

@@ -6,7 +6,7 @@
 
     <IsPackable>false</IsPackable>
 
-    <Version>2.4.0</Version>
+    <Version>2.5.0</Version>
 
     <Authors>Raphael Stoeckli</Authors>
 
@@ -34,7 +34,7 @@
 
     <PackageReleaseNotes>Please see https://github.com/rabanti-github/NanoXLSX/blob/master/Changelog.md for the release notes</PackageReleaseNotes>
 
-    <AssemblyVersion>2.4.0.0</AssemblyVersion>
+    <AssemblyVersion>2.5.0.0</AssemblyVersion>
 
     <FileVersion>2.4.0.0</FileVersion>
   </PropertyGroup>

docs/SearchHelp.aspx

@@ -5,14 +5,15 @@
 // System  : Sandcastle Help File Builder
 // File    : SearchHelp.aspx
 // Author  : Eric Woodruff  ([email protected])
-// Updated : 08/13/2022
-// Note    : Copyright 2007-2022, Eric Woodruff, All rights reserved
+// Updated : 05/15/2014
+// Note    : Copyright 2007-2015, Eric Woodruff, All rights reserved
+// Compiler: Microsoft C#
 //
 // This file contains the code used to search for keywords within the help topics using the full-text index
 // files created by the help file builder.
 //
 // This code is published under the Microsoft Public License (Ms-PL).  A copy of the license should be
-// distributed with the code and can be found at the project website: https://GitHub.com/EWSoftware/SHFB.  This
+// distributed with the code.  It can also be found at the project website: https://GitHub.com/EWSoftware/SHFB.  This
 // notice, the author's name, and all copyright notices must remain intact in all applications, documentation,
 // and source files.
 //
@@ -119,7 +120,7 @@ private List<string> ParseKeywords(string keywords)
     {
         checkWord = word.ToLower(CultureInfo.InvariantCulture);
         
-        if(checkWord.Length >= 2 && !Char.IsDigit(checkWord[0]) && !keywordList.Contains(checkWord))
+        if(checkWord.Length > 2 && !Char.IsDigit(checkWord[0]) && !keywordList.Contains(checkWord))
             keywordList.Add(checkWord);
     }
 
@@ -140,8 +141,7 @@ private string Search(List<string> keywords, List<string> fileInfo,
     StringBuilder sb = new StringBuilder(10240);
     Dictionary<string, List<long>> matches = new Dictionary<string, List<long>>();
     List<long> occurrences;
-    HashSet<int> matchingFileIndices = new HashSet<int>();
-    List<int> occurrenceIndices = new List<int>();
+    List<int> matchingFileIndices = new List<int>(), occurrenceIndices = new List<int>();
     List<Ranking> rankings = new List<Ranking>();
 
     string filename, title;
@@ -151,13 +151,7 @@ private string Search(List<string> keywords, List<string> fileInfo,
 
     foreach(string word in keywords)
     {
-        occurrences = new List<long>();
-
-        foreach(KeyValuePair<string, List<long>> kv in wordDictionary)
-            if(kv.Key.Contains(word))
-                occurrences.AddRange(kv.Value);
-
-        if(occurrences.Count == 0)
+        if(!wordDictionary.TryGetValue(word, out occurrences))
             return "<strong>Nothing found</strong>";
 
         matches.Add(word, occurrences);
@@ -170,14 +164,18 @@ private string Search(List<string> keywords, List<string> fileInfo,
         if(isFirst)
         {
             isFirst = false;
-            matchingFileIndices.UnionWith(occurrenceIndices);
+            matchingFileIndices.AddRange(occurrenceIndices);
         }
         else
         {
-            // After the first match, remove files that do not appear for all found keywords
-            foreach(int i in matchingFileIndices.ToArray())
-                if(!occurrenceIndices.Contains(i))
-                    matchingFileIndices.Remove(i);
+            // After the first match, remove files that do not appear for
+            // all found keywords.
+            for(idx = 0; idx < matchingFileIndices.Count; idx++)
+                if(!occurrenceIndices.Contains(matchingFileIndices[idx]))
+                {
+                    matchingFileIndices.RemoveAt(idx);
+                    idx--;
+                }
         }
     }
 
@@ -220,7 +218,7 @@ private string Search(List<string> keywords, List<string> fileInfo,
     });
 
     // Format the file list and return the results
-	sb.Append("<ol>");
+		sb.Append("<ol>");
 
     foreach(Ranking r in rankings)
         sb.AppendFormat("<li><a href=\"{0}\" target=\"_blank\">{1}</a></li>", r.Filename, r.PageTitle);

docs/SearchHelp.inc.php

@@ -30,7 +30,7 @@ function ParseKeywords($keywords)
     {
         $checkWord = strtolower($word);
         $first = substr($checkWord, 0, 1);
-        if(strlen($checkWord) >= 2 && !ctype_digit($first) && !in_array($checkWord, $keywordList))
+        if(strlen($checkWord) > 2 && !ctype_digit($first) && !in_array($checkWord, $keywordList))
         {
             array_push($keywordList, $checkWord);
         }

docs/Web.Config

@@ -15,7 +15,6 @@
 				<add namespace="System.Collections.Generic"/>
 				<add namespace="System.Globalization"/>
 				<add namespace="System.IO"/>
-				<add namespace="System.Linq"/>
 				<add namespace="System.Text"/>
 				<add namespace="System.Text.RegularExpressions"/>
 				<add namespace="System.Web"/>