Merge pull request #4 from Snawoot/normalize_unicode

Normalize Unicode

cmd/copeland/main.go

@@ -14,6 +14,7 @@ import (
 	"strings"
 
 	"github.com/Snawoot/copeland"
+	"golang.org/x/text/unicode/norm"
 )
 
 const (
@@ -23,13 +24,14 @@ const (
 var (
 	version = "undefined"
 
-	showVersion   = flag.Bool("version", false, "show program version and exit")
-	normalizeCase = flag.Bool("normalize-case", true, "normalize case")
-	scoreWin      = flag.Float64("score-win", 1, "score for win against opponent")
-	scoreTie      = flag.Float64("score-tie", .5, "score for tie against opponent")
-	scoreLoss     = flag.Float64("score-loss", 0, "score for tie against opponent")
-	names         = flag.String("names", "", "filename of list of names in the voting. If not specified names inferred from first ballot")
-	skipErrors    = flag.Bool("skip-errors", false, "skip ballot errors, but still report them")
+	showVersion      = flag.Bool("version", false, "show program version and exit")
+	normalizeCase    = flag.Bool("normalize-case", true, "normalize case")
+	normalizeUnicode = flag.Bool("normalize-unicode", true, "normalize unicode characters")
+	scoreWin         = flag.Float64("score-win", 1, "score for win against opponent")
+	scoreTie         = flag.Float64("score-tie", .5, "score for tie against opponent")
+	scoreLoss        = flag.Float64("score-loss", 0, "score for tie against opponent")
+	names            = flag.String("names", "", "filename of list of names in the voting. If not specified names inferred from first ballot")
+	skipErrors       = flag.Bool("skip-errors", false, "skip ballot errors, but still report them")
 )
 
 func cmdVersion() int {
@@ -154,6 +156,9 @@ func readBallot(input io.Reader) ([]string, error) {
 		if line == "" {
 			continue
 		}
+		if normalizeUnicode != nil && *normalizeUnicode {
+			line = norm.NFKC.String(line)
+		}
 		if normalizeCase != nil && *normalizeCase {
 			line = strings.ToUpper(line)
 		}

go.mod

@@ -1,3 +1,5 @@
 module github.com/Snawoot/copeland
 
 go 1.21.6
+
+require golang.org/x/text v0.14.0

go.sum

@@ -0,0 +1,2 @@
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=