From f5154edc539e2405e206105617ef7f6188b7e6a6 Mon Sep 17 00:00:00 2001 From: Marcel van Lohuizen Date: Wed, 30 Jan 2013 21:19:03 +0100 Subject: [PATCH] exp/locale/collate/tools/colcmp: fixes some discrepancies between ICU and collate package: ICU requires strings to be in FCD form. Not all NFC strings are in this form, leading to incorrect results. Change to NFD instead. R=rsc CC=golang-dev https://golang.org/cl/7201043 --- src/pkg/exp/locale/collate/tools/colcmp/colcmp.go | 2 +- src/pkg/exp/locale/collate/tools/colcmp/gen.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pkg/exp/locale/collate/tools/colcmp/colcmp.go b/src/pkg/exp/locale/collate/tools/colcmp/colcmp.go index 66d12127bd..cd8c94774c 100644 --- a/src/pkg/exp/locale/collate/tools/colcmp/colcmp.go +++ b/src/pkg/exp/locale/collate/tools/colcmp/colcmp.go @@ -279,7 +279,7 @@ func parseInput(args []string) []Input { } s = string(rs) if *doNorm { - s = norm.NFC.String(s) + s = norm.NFD.String(s) } input = append(input, makeInputString(s)) } diff --git a/src/pkg/exp/locale/collate/tools/colcmp/gen.go b/src/pkg/exp/locale/collate/tools/colcmp/gen.go index f9e31187de..0a14b10d09 100644 --- a/src/pkg/exp/locale/collate/tools/colcmp/gen.go +++ b/src/pkg/exp/locale/collate/tools/colcmp/gen.go @@ -139,7 +139,7 @@ func (g *phraseGenerator) generate(doNorm bool) []Input { buf16 = make([]uint16, 0, buf16Size) } if doNorm { - buf8 = norm.NFC.AppendString(buf8, str) + buf8 = norm.NFD.AppendString(buf8, str) } else { buf8 = append(buf8, str...) } -- 2.48.1