prevent combining unicode characters to display on windows (#5)

emprcl · Nov 6, 2024 · 9c12334 · 9c12334
1 parent 84e1024
commit 9c12334
Show file tree

Hide file tree

Showing 15 changed files with 50 additions and 31 deletions.
diff --git a/go.mod b/go.mod
@@ -7,7 +7,6 @@ require (
 	github.com/charmbracelet/bubbletea v1.1.0
 	github.com/charmbracelet/lipgloss v0.13.0
 	gitlab.com/gomidi/midi/v2 v2.2.10
-	golang.org/x/text v0.17.0
 )
 
 require (
@@ -25,4 +24,5 @@ require (
 	github.com/rivo/uniseg v0.4.7 // indirect
 	golang.org/x/sync v0.8.0 // indirect
 	golang.org/x/sys v0.24.0 // indirect
+	golang.org/x/text v0.17.0 // indirect
 )
diff --git a/ui/control.go b/ui/control.go
@@ -6,9 +6,9 @@ import (
 	"signls/core/common"
 	"signls/filesystem"
 	"signls/ui/param"
+	"signls/ui/util"
 
 	"github.com/charmbracelet/lipgloss"
-	"golang.org/x/text/unicode/norm"
 )
 
 const (
@@ -218,7 +218,7 @@ func (m mainModel) selectedNodeName() string {
 func bankGridLabel(nb int, g filesystem.Grid) string {
 	label := fmt.Sprintf("%2d", nb+1)
 	if !g.IsEmpty() {
-		label = norm.NFC.String(fmt.Sprintf("%2d\u0320", nb+1))
+		label = util.Normalize(fmt.Sprintf("%2d\u0320", nb+1))
 	}
 	return label
 }
diff --git a/ui/node.go b/ui/node.go
@@ -7,9 +7,9 @@ import (
 	"signls/core/music"
 	"signls/core/node"
 	"signls/ui/param"
+	"signls/ui/util"
 
 	"github.com/charmbracelet/lipgloss"
-	"golang.org/x/text/unicode/norm"
 )
 
 var (
@@ -81,7 +81,7 @@ func (m mainModel) renderNode(n common.Node, x, y int) string {
 		}
 		return activeEmitterStyle.Render("  ")
 	case music.Audible:
-		symbol := norm.NFC.String(n.Symbol())
+		symbol := util.Normalize(n.Symbol())
 
 		if isCursor && !m.edit {
 			return cursorStyle.Render(symbol)

diff --git a/ui/param/channel.go b/ui/param/channel.go
@@ -5,8 +5,7 @@ import (
 
 	"signls/core/common"
 	"signls/core/music"
-
-	"golang.org/x/text/unicode/norm"
+	"signls/ui/util"
 )
 
 type Channel struct {
@@ -19,7 +18,7 @@ func (c Channel) Name() string {
 
 func (c Channel) Display() string {
 	if c.nodes[0].(music.Audible).Note().Channel.RandomAmount() != 0 {
-		return norm.NFC.String(
+		return util.Normalize(
 			fmt.Sprintf(
 				"%d%+d\u033c",
 				c.nodes[0].(music.Audible).Note().Channel.Value()+1,

diff --git a/ui/param/key.go b/ui/param/key.go
@@ -7,7 +7,7 @@ import (
 	"signls/core/common"
 	"signls/core/music"
 
-	"golang.org/x/text/unicode/norm"
+	"signls/ui/util"
 )
 
 type KeyMode uint8
@@ -34,7 +34,7 @@ func (k *Key) Display() string {
 	}
 
 	if k.nodes[0].(music.Audible).Note().Key.RandomAmount() != 0 {
-		return norm.NFC.String(
+		return util.Normalize(
 			fmt.Sprintf(
 				"%s%+d\u033c",
 				k.nodes[0].(music.Audible).Note().Key.Display(),

diff --git a/ui/param/length.go b/ui/param/length.go
@@ -5,8 +5,7 @@ import (
 
 	"signls/core/common"
 	"signls/core/music"
-
-	"golang.org/x/text/unicode/norm"
+	"signls/ui/util"
 )
 
 const (
@@ -44,7 +43,7 @@ func (l Length) Display() string {
 		display = fmt.Sprintf("%.1f", float64(length)/float64(pulsesPerStep))
 	}
 	if l.nodes[0].(music.Audible).Note().Length.RandomAmount() != 0 {
-		return norm.NFC.String(
+		return util.Normalize(
 			fmt.Sprintf(
 				"%s%+.1f\u033c",
 				display,

diff --git a/ui/param/offset.go b/ui/param/offset.go
@@ -6,7 +6,7 @@ import (
 	"signls/core/common"
 	"signls/core/node"
 
-	"golang.org/x/text/unicode/norm"
+	"signls/ui/util"
 )
 
 type Offset struct {
@@ -19,7 +19,7 @@ func (o Offset) Name() string {
 
 func (o Offset) Display() string {
 	if o.nodes[0].(*node.EuclidEmitter).Offset.RandomAmount() != 0 {
-		return norm.NFC.String(
+		return util.Normalize(
 			fmt.Sprintf(
 				"%d%+d\u033c",
 				o.nodes[0].(*node.EuclidEmitter).Offset.Value(),

diff --git a/ui/param/steps.go b/ui/param/steps.go
@@ -6,7 +6,7 @@ import (
 	"signls/core/common"
 	"signls/core/node"
 
-	"golang.org/x/text/unicode/norm"
+	"signls/ui/util"
 )
 
 type Steps struct {
@@ -19,7 +19,7 @@ func (s Steps) Name() string {
 
 func (s Steps) Display() string {
 	if s.nodes[0].(*node.EuclidEmitter).Steps.RandomAmount() != 0 {
-		return norm.NFC.String(
+		return util.Normalize(
 			fmt.Sprintf(
 				"%d%+d\u033c",
 				s.nodes[0].(*node.EuclidEmitter).Steps.Value(),

diff --git a/ui/param/threshold.go b/ui/param/threshold.go
@@ -7,7 +7,7 @@ import (
 	"signls/core/common"
 	"signls/core/node"
 
-	"golang.org/x/text/unicode/norm"
+	"signls/ui/util"
 )
 
 type Threshold struct {
@@ -20,7 +20,7 @@ func (t Threshold) Name() string {
 
 func (t Threshold) Display() string {
 	if t.control().RandomAmount() != 0 {
-		return norm.NFC.String(
+		return util.Normalize(
 			fmt.Sprintf(
 				"%d%+d\u033c",
 				t.control().Value(),

diff --git a/ui/param/triggers.go b/ui/param/triggers.go
@@ -5,8 +5,7 @@ import (
 
 	"signls/core/common"
 	"signls/core/node"
-
-	"golang.org/x/text/unicode/norm"
+	"signls/ui/util"
 )
 
 const (
@@ -23,7 +22,7 @@ func (t Triggers) Name() string {
 
 func (t Triggers) Display() string {
 	if t.nodes[0].(*node.EuclidEmitter).Triggers.RandomAmount() != 0 {
-		return norm.NFC.String(
+		return util.Normalize(
 			fmt.Sprintf(
 				"%d%+d\u033c",
 				t.nodes[0].(*node.EuclidEmitter).Triggers.Value(),

diff --git a/ui/param/velocity.go b/ui/param/velocity.go
@@ -5,8 +5,7 @@ import (
 
 	"signls/core/common"
 	"signls/core/music"
-
-	"golang.org/x/text/unicode/norm"
+	"signls/ui/util"
 )
 
 type Velocity struct {
@@ -19,7 +18,7 @@ func (v Velocity) Name() string {
 
 func (v Velocity) Display() string {
 	if v.nodes[0].(music.Audible).Note().Velocity.RandomAmount() != 0 {
-		return norm.NFC.String(
+		return util.Normalize(
 			fmt.Sprintf(
 				"%d%+d\u033c",
 				v.nodes[0].(music.Audible).Note().Velocity.Value(),

diff --git a/ui/ui.go b/ui/ui.go
@@ -9,6 +9,7 @@ import (
 	"signls/core/node"
 	"signls/filesystem"
 	"signls/ui/param"
+	"signls/ui/util"
 
 	"github.com/charmbracelet/bubbles/help"
 	"github.com/charmbracelet/bubbles/key"
@@ -467,5 +468,5 @@ func moveCursor(dir string, speed, x, y, minX, maxX, minY, maxY int) (int, int)
 	default:
 		newX, newY = 0, 0
 	}
-	return clamp(newX, minX, maxX), clamp(newY, minY, maxY)
+	return util.Clamp(newX, minX, maxX), util.Clamp(newY, minY, maxY)
 }
diff --git a/ui/util.go b/ui/util.go
diff --git a/ui/util/norm.go b/ui/util/norm.go
@@ -0,0 +1,22 @@
+package util
+
+import (
+	"runtime"
+	"strings"
+	"unicode"
+)
+
+// Normalize process strings with unicode characters
+// to handle weird behaviors on specific platforms.
+// Mainly for windows right now.
+func Normalize(text string) string {
+	if runtime.GOOS != "windows" {
+		return text
+	}
+	return strings.Map(func(r rune) rune {
+		if unicode.IsMark(r) {
+			return -1
+		}
+		return r
+	}, text)
+}
diff --git a/ui/util/value.go b/ui/util/value.go
@@ -0,0 +1,5 @@
+package util
+
+func Clamp(value, minimum, maximum int) int {
+	return max(min(value, maximum), minimum)
+}