Merge pull request #57 from BDisp/rune-extensions-with-this

gui-cs · May 13, 2022 · c2ebd71 · c2ebd71
2 parents 03d48da + b18d0d0
commit c2ebd71
Show file tree

Hide file tree

Showing 70 changed files with 17,993 additions and 5,898 deletions.
diff --git a/Makefile b/Makefile
@@ -1,12 +1,17 @@
-all: doc-update yaml
+all: dotnet-build doc-update yaml
+
+dotnet-build:
+	msbuild NStack.sln /t:clean /p:configuration=Release
+	msbuild NStack.sln -t:restore -p:RestorePackagesConfig=true /p:configuration=Release
+	msbuild NStack.sln /p:Configuration=Release /p:DocumentationFile="bin/Release/NStack.xml"
 
 # Target for using mdoc and my old doc template
 rebuild-docs: odocs/template
 	mdoc export-html --force-update -o odocs --template=odocs/template ecmadocs/en/
 
 # Used to fetch XML doc updates from the C# compiler into the ECMA docs
 doc-update:
-	mdoc update -i NStack/bin/Debug/NStack.xml -o ecmadocs/en NStack/bin/Debug/NStack.dll 
+	mdoc update -i NStack/bin/Release/NStack.xml -o ecmadocs/en NStack/bin/Release/netstandard2.0/NStack.dll
 
 yaml:
 	-rm /cvs/NStack/ecmadocs/en/ns-.xml

diff --git a/NStack.sln b/NStack.sln
@@ -1,9 +1,10 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NStack", "NStack\NStack.csproj", "{844D229D-99C7-46EE-879A-730F115BA309}"
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.32126.317
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NStack", "NStack\NStack.csproj", "{844D229D-99C7-46EE-879A-730F115BA309}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NStackTests", "NStackTests\NStackTests.csproj", "{21125504-5F4D-48A3-8978-A552627A8D26}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NStackTests", "NStackTests\NStackTests.csproj", "{21125504-5F4D-48A3-8978-A552627A8D26}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -20,6 +21,12 @@ Global
 		{21125504-5F4D-48A3-8978-A552627A8D26}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{21125504-5F4D-48A3-8978-A552627A8D26}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {1C05A47D-96AF-4F77-AB01-94B83D48D555}
+	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		Policies = $0
 		$0.TextStylePolicy = $1

diff --git a/NStack/NStack.csproj b/NStack/NStack.csproj
@@ -39,7 +39,8 @@ Added ustring.ColumnWidth to return number of columns that a ustring takes in a
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DocumentationFile>bin\Debug\netstandard1.6\NStack.xml</DocumentationFile>
+	  <GenerateDocumentationFile Condition=" '$(Configuration)' == 'Release' ">true</GenerateDocumentationFile>
+    <DocumentationFile>bin\Release\NStack.xml</DocumentationFile>
     <LangVersion>Latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

diff --git a/NStack/strings/ustring.cs b/NStack/strings/ustring.cs
@@ -57,19 +57,19 @@ namespace NStack {
 	///     <description>Creates a ustring from a range in a byte array.</description>
 	///   </item>
 	///   <item>
-	///     <term><see cref="M:NStack.ustring.Make(uint)"/></term>
+	///     <term><see cref="M:NStack.ustring.Make(uint[])"/></term>
 	///     <description>Creates a ustring from a single rune.</description>
 	///   </item>
 	///   <item>
 	///     <term><see cref="M:NStack.ustring.Make(char[])"/></term>
 	///     <description>Creates a ustring from a character array.</description>
 	///   </item>
 	///   <item>
-	///     <term><see cref="M:NStack.ustring.Make(System.IntPtr,int,System.Action{NStack.ustring, System.IntPtr})"/></term>
+	///     <term><see cref="M:NStack.ustring.Make(System.IntPtr,int,System.Action{System.IntPtr})"/></term>
 	///     <description>Creates a ustring from an unmanaged memory block, with an optional method to invoke to release the block when the ustring is garbage collected.</description>
 	///   </item>
 	///   <item>
-	///     <term><see cref="M:NStack.ustring.Make(System.IntPtr,System.Action{NStack.ustring, System.IntPtr})"/></term>
+	///     <term><see cref="M:NStack.ustring.Make(System.IntPtr,System.Action{System.IntPtr})"/></term>
 	///     <description>
 	///       Creates a ustring from an unmanaged memory block that is null-terminated, suitable for interoperability with C APIs.   
 	///       It takes an optional method to invoke to release the block when the ustring is garbage collected.
@@ -89,7 +89,7 @@ namespace NStack {
 	/// </para>
 	/// <para>
 	///   The Length property describes the length in bytes of the underlying array, while the RuneCount 
-	///   property describes the number of code points (or runes) that are reprenseted by the underlying 
+	///   property describes the number of code points (or runes) that are represented by the underlying 
 	///   utf8 encoded buffer.
 	/// </para>
 	/// <para>
@@ -629,6 +629,12 @@ unsafe static bool EqualsHelper (byte* a, byte* b, int length)
 		// The high-level version parameters have been validated
 		static bool EqualsHelper (ustring a, ustring b)
 		{
+			// If both string are identical, return true.
+			if (a.SequenceEqual(b))
+			{
+				return true;
+			}
+
 			var alen = a.Length;
 			var blen = b.Length;
 			if (alen != blen)
@@ -1067,14 +1073,14 @@ public int ConsoleWidth {
 				for (int i = 0; i < blen;) {
 					(var rune, var size) = Utf8.DecodeRune (this, i, i - blen);
 					i += size;
-					total += Rune.IsNonSpacingChar(rune, out int width) ? width : Rune.ColumnWidth(rune);
+					total += Rune.ColumnWidth(rune);
 				}
 				return total;
 			}
 		}
 
 		/// <summary>
-		/// Copies the specified number of bytes from the the underlying ustring representation to the target array at the specified offset.
+		/// Copies the specified number of bytes from the underlying ustring representation to the target array at the specified offset.
 		/// </summary>
 		/// <param name="fromOffset">Offset in the underlying ustring buffer to copy from.</param>
 		/// <param name="target">Target array where the buffer contents will be copied to.</param>
@@ -1299,7 +1305,7 @@ public bool Contains (uint rune)
 		/// Returns a value indicating whether any of the characters in the provided string occurs within this string.
 		/// </summary>
 		/// <returns>true if any of the characters in <paramref name="chars" /> parameter occurs within this string; otherwise, false.</returns>
-		/// <param name="chars">string contanining one or more characters.</param>
+		/// <param name="chars">string containing one or more characters.</param>
 		public bool ContainsAny (ustring chars)
 		{
 			if ((object)chars == null)

diff --git a/NStack/unicode/.gitignore b/NStack/unicode/.gitignore
@@ -1,2 +1,3 @@
 maketables
 UnicodeData.txt
+CaseFolding.txt
diff --git a/NStack/unicode/.vscode/launch.json b/NStack/unicode/.vscode/launch.json
@@ -0,0 +1,15 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch Package",
+            "type": "go",
+            "request": "launch",
+            "mode": "auto",
+            "program": "${file}"
+        }
+    ]
+}
diff --git a/NStack/unicode/Letter.cs b/NStack/unicode/Letter.cs
@@ -95,7 +95,7 @@ public struct RangeTable {
 			readonly Range32 []R32;
 
 			/// <summary>
-			/// The number of entries in the short range table (R16) with with Hi being less than MaxLatin1
+			/// The number of entries in the short range table (R16) with Hi being less than MaxLatin1
 			/// </summary>
 			public readonly int LatinOffset;
 

diff --git a/NStack/unicode/Makefile b/NStack/unicode/Makefile
@@ -1,11 +1,11 @@
-Tables.cs: UnicodeData.txt maketables.go UnicodeData.txt Makefile maketables
+Tables.cs: UnicodeData.txt maketables.go CaseFolding.txt Makefile maketables
 	./maketables --tables=all > Tables.cs
 
 UnicodeData.txt:
-	curl -O http://www.unicode.org/Public/9.0.0/ucd/UnicodeData.txt
+	curl -O http://www.unicode.org/Public/14.0.0/ucd/UnicodeData.txt
 
 CaseFolding.txt:
-	curl -O http://www.unicode.org/Public/9.0.0/ucd/CaseFolding.tx
+	curl -O http://www.unicode.org/Public/14.0.0/ucd/CaseFolding.txt
 
 maketables: maketables.go
 	go build maketables.go
diff --git a/NStack/unicode/Rune.ColumnWidth.cs b/NStack/unicode/Rune.ColumnWidth.cs
@@ -9,54 +9,52 @@ namespace System
 	public partial struct Rune
 	{
 		static uint[,] combining = new uint[,] {
-			{ 0x0300, 0x036F, 0 }, { 0x0483, 0x0486, 0 }, { 0x0488, 0x0489, 0 },
-			{ 0x0591, 0x05BD, 0 }, { 0x05BF, 0x05BF, 0 }, { 0x05C1, 0x05C2, 0 },
-			{ 0x05C4, 0x05C5, 0 }, { 0x05C7, 0x05C7, 0 }, { 0x0600, 0x0603, 0 },
-			{ 0x0610, 0x0615, 0 }, { 0x064B, 0x065E, 0 }, { 0x0670, 0x0670, 0 },
-			{ 0x06D6, 0x06E4, 0 }, { 0x06E7, 0x06E8, 0 }, { 0x06EA, 0x06ED, 0 },
-			{ 0x070F, 0x070F, 0 }, { 0x0711, 0x0711, 0 }, { 0x0730, 0x074A, 0 },
-			{ 0x07A6, 0x07B0, 0 }, { 0x07EB, 0x07F3, 0 }, { 0x0901, 0x0902, 0 },
-			{ 0x093C, 0x093C, 0 }, { 0x0941, 0x0948, 0 }, { 0x094D, 0x094D, 0 },
-			{ 0x0951, 0x0954, 0 }, { 0x0962, 0x0963, 0 }, { 0x0981, 0x0981, 0 },
-			{ 0x09BC, 0x09BC, 0 }, { 0x09C1, 0x09C4, 0 }, { 0x09CD, 0x09CD, 0 },
-			{ 0x09E2, 0x09E3, 0 }, { 0x0A01, 0x0A02, 0 }, { 0x0A3C, 0x0A3C, 0 },
-			{ 0x0A41, 0x0A42, 0 }, { 0x0A47, 0x0A48, 0 }, { 0x0A4B, 0x0A4D, 0 },
-			{ 0x0A70, 0x0A71, 0 }, { 0x0A81, 0x0A82, 0 }, { 0x0ABC, 0x0ABC, 0 },
-			{ 0x0AC1, 0x0AC5, 0 }, { 0x0AC7, 0x0AC8, 0 }, { 0x0ACD, 0x0ACD, 0 },
-			{ 0x0AE2, 0x0AE3, 0 }, { 0x0B01, 0x0B01, 0 }, { 0x0B3C, 0x0B3C, 0 },
-			{ 0x0B3F, 0x0B3F, 0 }, { 0x0B41, 0x0B43, 0 }, { 0x0B4D, 0x0B4D, 0 },
-			{ 0x0B56, 0x0B56, 0 }, { 0x0B82, 0x0B82, 0 }, { 0x0BC0, 0x0BC0, 0 },
-			{ 0x0BCD, 0x0BCD, 0 }, { 0x0C3E, 0x0C40, 0 }, { 0x0C46, 0x0C48, 0 },
-			{ 0x0C4A, 0x0C4D, 0 }, { 0x0C55, 0x0C56, 0 }, { 0x0CBC, 0x0CBC, 0 },
-			{ 0x0CBF, 0x0CBF, 0 }, { 0x0CC6, 0x0CC6, 0 }, { 0x0CCC, 0x0CCD, 0 },
-			{ 0x0CE2, 0x0CE3, 0 }, { 0x0D41, 0x0D43, 0 }, { 0x0D4D, 0x0D4D, 0 },
-			{ 0x0DCA, 0x0DCA, 0 }, { 0x0DD2, 0x0DD4, 0 }, { 0x0DD6, 0x0DD6, 0 },
-			{ 0x0E31, 0x0E31, 0 }, { 0x0E34, 0x0E3A, 0 }, { 0x0E47, 0x0E4E, 0 },
-			{ 0x0EB1, 0x0EB1, 0 }, { 0x0EB4, 0x0EB9, 0 }, { 0x0EBB, 0x0EBC, 0 },
-			{ 0x0EC8, 0x0ECD, 0 }, { 0x0F18, 0x0F19, 0 }, { 0x0F35, 0x0F35, 0 },
-			{ 0x0F37, 0x0F37, 0 }, { 0x0F39, 0x0F39, 0 }, { 0x0F71, 0x0F7E, 0 },
-			{ 0x0F80, 0x0F84, 0 }, { 0x0F86, 0x0F87, 0 }, { 0x0F90, 0x0F97, 0 },
-			{ 0x0F99, 0x0FBC, 0 }, { 0x0FC6, 0x0FC6, 0 }, { 0x102D, 0x1030, 0 },
-			{ 0x1032, 0x1032, 0 }, { 0x1036, 0x1037, 0 }, { 0x1039, 0x1039, 0 },
-			{ 0x1058, 0x1059, 0 }, { 0x1160, 0x11FF, 2 }, { 0x135F, 0x135F, 0 },
-			{ 0x1712, 0x1714, 0 }, { 0x1732, 0x1734, 0 }, { 0x1752, 0x1753, 0 },
-			{ 0x1772, 0x1773, 0 }, { 0x17B4, 0x17B5, 0 }, { 0x17B7, 0x17BD, 0 },
-			{ 0x17C6, 0x17C6, 0 }, { 0x17C9, 0x17D3, 0 }, { 0x17DD, 0x17DD, 0 },
-			{ 0x180B, 0x180D, 0 }, { 0x18A9, 0x18A9, 0 }, { 0x1920, 0x1922, 0 },
-			{ 0x1927, 0x1928, 0 }, { 0x1932, 0x1932, 0 }, { 0x1939, 0x193B, 0 },
-			{ 0x1A17, 0x1A18, 0 }, { 0x1B00, 0x1B03, 0 }, { 0x1B34, 0x1B34, 0 },
-			{ 0x1B36, 0x1B3A, 0 }, { 0x1B3C, 0x1B3C, 0 }, { 0x1B42, 0x1B42, 0 },
-			{ 0x1B6B, 0x1B73, 0 }, { 0x1DC0, 0x1DCA, 0 }, { 0x1DFE, 0x1DFF, 0 },
-			{ 0x200B, 0x200F, 0 }, { 0x202A, 0x202E, 0 }, { 0x2060, 0x2063, 0 },
-			{ 0x206A, 0x206F, 0 }, { 0x20D0, 0x20EF, 0 }, { 0x302A, 0x302F, 2 },
-			{ 0x3099, 0x309A, 2 }, { 0xA806, 0xA806, 0 }, { 0xA80B, 0xA80B, 0 },
-			{ 0xA825, 0xA826, 0 }, { 0xFB1E, 0xFB1E, 0 }, { 0xFE00, 0xFE0F, 0 },
-			{ 0xFE20, 0xFE23, 0 }, { 0xFEFF, 0xFEFF, 0 }, { 0xFFF9, 0xFFFB, 0 },
-			{ 0x10A01, 0x10A03, 0 }, { 0x10A05, 0x10A06, 0 }, { 0x10A0C, 0x10A0F, 0 },
-			{ 0x10A38, 0x10A3A, 0 }, { 0x10A3F, 0x10A3F, 0 }, { 0x1D167, 0x1D169, 2 },
-			{ 0x1D173, 0x1D182, 2 }, { 0x1D185, 0x1D18B, 2 }, { 0x1D1AA, 0x1D1AD, 2 },
-			{ 0x1D242, 0x1D244, 2 }, { 0xE0001, 0xE0001, 0 }, { 0xE0020, 0xE007F, 0 },
-			{ 0xE0100, 0xE01EF, 0 }
+			{ 0x0300, 0x036F }, { 0x0483, 0x0486 }, { 0x0488, 0x0489 },
+			{ 0x0591, 0x05BD }, { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 },
+			{ 0x05C4, 0x05C5 }, { 0x05C7, 0x05C7 }, { 0x0600, 0x0603 },
+			{ 0x0610, 0x0615 }, { 0x064B, 0x065E }, { 0x0670, 0x0670 },
+			{ 0x06D6, 0x06E4 }, { 0x06E7, 0x06E8 }, { 0x06EA, 0x06ED },
+			{ 0x070F, 0x070F }, { 0x0711, 0x0711 }, { 0x0730, 0x074A },
+			{ 0x07A6, 0x07B0 }, { 0x07EB, 0x07F3 }, { 0x0901, 0x0902 },
+			{ 0x093C, 0x093C }, { 0x0941, 0x0948 }, { 0x094D, 0x094D },
+			{ 0x0951, 0x0954 }, { 0x0962, 0x0963 }, { 0x0981, 0x0981 },
+			{ 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 }, { 0x09CD, 0x09CD },
+			{ 0x09E2, 0x09E3 }, { 0x0A01, 0x0A02 }, { 0x0A3C, 0x0A3C },
+			{ 0x0A41, 0x0A42 }, { 0x0A47, 0x0A48 }, { 0x0A4B, 0x0A4D },
+			{ 0x0A70, 0x0A71 }, { 0x0A81, 0x0A82 }, { 0x0ABC, 0x0ABC },
+			{ 0x0AC1, 0x0AC5 }, { 0x0AC7, 0x0AC8 }, { 0x0ACD, 0x0ACD },
+			{ 0x0AE2, 0x0AE3 }, { 0x0B01, 0x0B01 }, { 0x0B3C, 0x0B3C },
+			{ 0x0B3F, 0x0B3F }, { 0x0B41, 0x0B43 }, { 0x0B4D, 0x0B4D },
+			{ 0x0B56, 0x0B56 }, { 0x0B82, 0x0B82 }, { 0x0BC0, 0x0BC0 },
+			{ 0x0BCD, 0x0BCD }, { 0x0C3E, 0x0C40 }, { 0x0C46, 0x0C48 },
+			{ 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 }, { 0x0CBC, 0x0CBC },
+			{ 0x0CBF, 0x0CBF }, { 0x0CC6, 0x0CC6 }, { 0x0CCC, 0x0CCD },
+			{ 0x0CE2, 0x0CE3 }, { 0x0D41, 0x0D43 }, { 0x0D4D, 0x0D4D },
+			{ 0x0DCA, 0x0DCA }, { 0x0DD2, 0x0DD4 }, { 0x0DD6, 0x0DD6 },
+			{ 0x0E31, 0x0E31 }, { 0x0E34, 0x0E3A }, { 0x0E47, 0x0E4E },
+			{ 0x0EB1, 0x0EB1 }, { 0x0EB4, 0x0EB9 }, { 0x0EBB, 0x0EBC },
+			{ 0x0EC8, 0x0ECD }, { 0x0F18, 0x0F19 }, { 0x0F35, 0x0F35 },
+			{ 0x0F37, 0x0F37 }, { 0x0F39, 0x0F39 }, { 0x0F71, 0x0F7E },
+			{ 0x0F80, 0x0F84 }, { 0x0F86, 0x0F87 }, { 0x0F90, 0x0F97 },
+			{ 0x0F99, 0x0FBC }, { 0x0FC6, 0x0FC6 }, { 0x102D, 0x1030 },
+			{ 0x1032, 0x1032 }, { 0x1036, 0x1037 }, { 0x1039, 0x1039 },
+			{ 0x1058, 0x1059 }, { 0x1160, 0x11FF }, { 0x135F, 0x135F },
+			{ 0x1712, 0x1714 }, { 0x1732, 0x1734 }, { 0x1752, 0x1753 },
+			{ 0x1772, 0x1773 }, { 0x17B4, 0x17B5 }, { 0x17B7, 0x17BD },
+			{ 0x17C6, 0x17C6 }, { 0x17C9, 0x17D3 }, { 0x17DD, 0x17DD },
+			{ 0x180B, 0x180D }, { 0x18A9, 0x18A9 }, { 0x1920, 0x1922 },
+			{ 0x1927, 0x1928 }, { 0x1932, 0x1932 }, { 0x1939, 0x193B },
+			{ 0x1A17, 0x1A18 }, { 0x1B00, 0x1B03 }, { 0x1B34, 0x1B34 },
+			{ 0x1B36, 0x1B3A }, { 0x1B3C, 0x1B3C }, { 0x1B42, 0x1B42 },
+			{ 0x1B6B, 0x1B73 }, { 0x1DC0, 0x1DCA }, { 0x1DFE, 0x1DFF },
+			{ 0x200B, 0x200F }, { 0x202A, 0x202E }, { 0x2060, 0x2063 },
+			{ 0x206A, 0x206F }, { 0x20D0, 0x20EF }, { 0x2e9a, 0x2e9a },
+			{ 0x2ef4, 0x2eff }, { 0x2fd6, 0x2fef }, { 0x2ffc, 0x2fff },
+			{ 0x31e4, 0x31ef }, { 0x321f, 0x321f }, { 0xA48D, 0xA48F },
+			{ 0xA806, 0xA806 }, { 0xA80B, 0xA80B }, { 0xA825, 0xA826 },
+			{ 0xFB1E, 0xFB1E }, { 0xFE00, 0xFE0F }, { 0xFE1A, 0xFE1F },
+			{ 0xFE20, 0xFE23 }, { 0xFE53, 0xFE53 }, { 0xFE67, 0xFE67 },
+			{ 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB },
 		};
 
 		static uint[,] combiningWideChars = new uint[,] {
@@ -70,12 +68,23 @@ public partial struct Rune
 			/* Alphabetic Presentation Forms - 0xFB00, 0xFb4f */
 			/* Chess Symbols - 0x1FA00, 0x1FA0f */
 
-			{ 0x1100, 0x115f, 2 }, { 0x231a, 0x231b, 2 }, { 0x2e80, 0x303e, 2 },
-			{ 0x3041, 0x3096, 2 }, { 0x3099, 0x30ff, 2 }, { 0x3105, 0x312e, 2 },
-			{ 0x3131, 0x318e, 2 }, { 0x3190, 0x3247, 2 }, { 0x3250, 0x4dbf, 2 },
-			{ 0x4e00, 0xa4c6, 2 }, { 0xa960, 0xa97c, 2 }, { 0xac00 ,0xd7a3, 2 },
-			{ 0xf900, 0xfaff, 2 }, { 0xfe10, 0xfe1f, 2 }, { 0xfe30 ,0xfe6b, 2 },
-			{ 0xff01, 0xff60, 2 }, { 0xffe0, 0xffe6, 2 }
+			{ 0x1100, 0x115f }, { 0x231a, 0x231b }, { 0x2329, 0x232a },
+			{ 0x23e9, 0x23ec }, { 0x23f0, 0x23f0 }, { 0x23f3, 0x23f3 },
+			{ 0x25fd, 0x25fe }, { 0x2614, 0x2615 }, { 0x2648, 0x2653 },
+			{ 0x267f, 0x267f }, { 0x2693, 0x2693 }, { 0x26a1, 0x26a1 },
+			{ 0x26aa, 0x26ab }, { 0x26bd, 0x26be }, { 0x26c4, 0x26c5 },
+			{ 0x26ce, 0x26ce }, { 0x26d4, 0x26d4 }, { 0x26ea, 0x26ea },
+			{ 0x26f2, 0x26f3 }, { 0x26f5, 0x26f5 }, { 0x26fa, 0x26fa },
+			{ 0x26fd, 0x26fd }, { 0x2705, 0x2705 }, { 0x270a, 0x270b },
+			{ 0x2728, 0x2728 }, { 0x274c, 0x274c }, { 0x274e, 0x274e },
+			{ 0x2753, 0x2755 }, { 0x2757, 0x2757 }, { 0x2795, 0x2797 },
+			{ 0x27b0, 0x27b0 }, { 0x27bf, 0x27bf }, { 0x2b1b, 0x2b1c },
+			{ 0x2b50, 0x2b50 }, { 0x2b55, 0x2b55 }, { 0x2e80, 0x303e },
+			{ 0x3041, 0x3096 }, { 0x3099, 0x30ff }, { 0x3105, 0x312f },
+			{ 0x3131, 0x318e }, { 0x3190, 0x3247 }, { 0x3250, 0x4dbf },
+			{ 0x4e00, 0xa4c6 }, { 0xa960, 0xa97c }, { 0xac00 ,0xd7a3 },
+			{ 0xf900, 0xfaff }, { 0xfe10, 0xfe1f }, { 0xfe30 ,0xfe6b },
+			{ 0xff01, 0xff60 }, { 0xffe0, 0xffe6 }
 		};
 
 		static int bisearch(uint rune, uint[,] table, int max)
@@ -99,23 +108,24 @@ static int bisearch(uint rune, uint[,] table, int max)
 			return 0;
 		}
 
-		static bool bisearch(uint rune, uint[,] table, out int width)
-		{
-			width = 0;
-			var length = table.GetLength(0);
-			if (length == 0 || rune < table[0, 0] || rune > table[length - 1, 1])
-				return false;
-
-			for (int i = 0; i < length; i++)
-			{
-				if (rune >= table[i, 0] && rune <= table[i, 1]) {
-					width = (int)table[i, 2];
-					return true;
-				}
-			}
-
-			return false;
-		}
+		//static bool bisearch(uint rune, uint[,] table, out int width)
+		//{
+		//	width = 0;
+		//	var length = table.GetLength(0);
+		//	if (length == 0 || rune < table[0, 0] || rune > table[length - 1, 1])
+		//		return false;
+
+		//	for (int i = 0; i < length; i++)
+		//	{
+		//		if (rune >= table[i, 0] && rune <= table[i, 1])
+		//		{
+		//			width = (int)table[i, 2];
+		//			return true;
+		//		}
+		//	}
+
+		//	return false;
+		//}
 
 		static uint gethexaformat(uint rune, int length)
 		{
@@ -128,22 +138,21 @@ static uint gethexaformat(uint rune, int length)
 		/// Check if the rune is a non-spacing character.
 		/// </summary>
 		/// <param name="rune">The rune.</param>
-		/// <param name="width">The width.</param>
 		/// <returns>True if is a non-spacing character, false otherwise.</returns>
-		public static bool IsNonSpacingChar(uint rune, out int width)
-        {
-			return bisearch(rune, combining, out width);
-        }
+		public static bool IsNonSpacingChar(uint rune)
+		{
+			return bisearch(rune, combining, combining.GetLength(0) - 1) != 0;
+		}
 
 		/// <summary>
 		/// Check if the rune is a wide character.
 		/// </summary>
 		/// <param name="rune">The rune.</param>
 		/// <returns>True if is a wide character, false otherwise.</returns>
 		public static bool IsWideChar(uint rune)
-        {
-			return bisearch(gethexaformat(rune, 4), combiningWideChars, out _);
-        }
+		{
+			return bisearch(gethexaformat(rune, 4), combiningWideChars, combiningWideChars.GetLength(0) - 1) != 0;
+		}
 
 		static char firstSurrogatePairChar = '\0';
 
@@ -162,12 +171,11 @@ public static int ColumnWidth(Rune rune)
 			if (irune < 0x7f)
 				return 1;
 			/* binary search in table of non-spacing characters */
-			if (bisearch(irune, combining, out int width))
-				// if (bisearch(irune, combining, combining.GetLength(0) - 1) != 0)
-				// return 0;
-				return width;
+			if (bisearch(gethexaformat(irune, 4), combining, combining.GetLength(0) - 1) != 0)
+				return 0;
 			/* if we arrive here, ucs is not a combining or C0/C1 control character */
-			return bisearch(gethexaformat(irune, 4), combiningWideChars, out width) ? width : 1;
+			return 1 +
+				(bisearch(gethexaformat(irune, 4), combiningWideChars, combiningWideChars.GetLength(0) - 1) != 0 ? 1 : 0);
 		}
 
 		/// <summary>