Merge branch 'v2_develop' of tig:tig/Terminal.Gui into v2_develop

Author: tig

GitVersion.yml

@@ -19,7 +19,7 @@ branches:
 
   v1_develop:
     mode: ContinuousDeployment
-    tag: dev
+    tag: v1_develop
     regex: v1_develop
     source-branches:
     - v1_release

README.md

@@ -28,6 +28,8 @@ cd myproj
 dotnet run
 ```
 
+There is also a [visual designer](https://github.com/gui-cs/TerminalGuiDesigner) (uses Terminal.Gui itself).
+
 ## Documentation 
 
 * [Getting Started](https://gui-cs.github.io/Terminal.GuiV2Docs/docs/getting-started.html)
@@ -47,14 +49,16 @@ The team is looking forward to seeing new amazing projects made by the community
 
 ## Sample Usage in C#
 
-The following example shows a basic Terminal.Gui application in C#:
-
-[!code-csharp[](./Example/Example.cs)]
+The following example shows a basic Terminal.Gui application in C#:  
+[Example (source)](./Example/Example.cs)
 
 When run the application looks as follows:
 
 ![Simple Usage app](./docfx/images/Example.png)
 
+## Sample usage in F#  
+F# examples are located [here](./FSharpExample/Program.fs)
+
 ## Installing
 
 Use NuGet to install the `Terminal.Gui` NuGet package: https://www.nuget.org/packages/Terminal.Gui

Terminal.Gui/Text/TextFormatter.cs

@@ -2124,7 +2124,7 @@ public static string RemoveHotKeySpecifier (string text, int hotPos, Rune hotKey
         var start = string.Empty;
         var i = 0;
 
-        foreach (Rune c in text)
+        foreach (Rune c in text.EnumerateRunes ())
         {
             if (c == hotKeySpecifier && i == hotPos)
             {

UnitTests/Views/LabelTests.cs

@@ -1460,4 +1460,16 @@ public void CanFocus_True_MouseClick_Focuses ()
         Application.Top.Dispose ();
         Application.ResetState ();
     }
+
+    // https://github.com/gui-cs/Terminal.Gui/issues/3893
+    [Fact]
+    [SetupFakeDriver]
+    public void TestLabelUnderscoreMinus ()
+    {
+        var lbl = new Label ()
+        {
+            Text = "TextView with some more test_- text. Unicode shouldn't 𝔹Aℝ𝔽!"
+        };
+        lbl.Draw ();
+    }
 }