Use ICU for better Unicode sorting

hledger/Hledger/Cli/Commands/Descriptions.hs

@@ -14,7 +14,8 @@ module Hledger.Cli.Commands.Descriptions (
  ,descriptions
 ) where
 
-import Data.List.Extra (nubSort)
+import Data.List.Extra (nubSortBy)
+import qualified Data.Text.Collate as Collate
 import qualified Data.Text.IO as T
 
 import Hledger
@@ -33,6 +34,7 @@ descriptionsmode = hledgerCommandMode
 descriptions :: CliOpts -> Journal -> IO ()
 descriptions CliOpts{reportspec_=rspec} j = do
   let ts = entriesReport rspec j
-      descs = nubSort $ map tdescription ts
+      collator = Collate.collatorFor "en" (Collate.CollatorOptions {Collate.strength = Collate.Primary})
+      descs = nubSort (Collate.compare collator) $ map tdescription ts
 
   mapM_ T.putStrLn descs

hledger/Hledger/Cli/Commands/Notes.hs

@@ -15,7 +15,8 @@ module Hledger.Cli.Commands.Notes (
  ,notes
 ) where
 
-import Data.List.Extra (nubSort)
+import Data.List.Extra (nubSortBy)
+import qualified Data.Text.Collate as Collate
 import qualified Data.Text.IO as T
 
 import Hledger
@@ -34,5 +35,6 @@ notesmode = hledgerCommandMode
 notes :: CliOpts -> Journal -> IO ()
 notes CliOpts{reportspec_=rspec} j = do
   let ts = entriesReport rspec j
-      notes' = nubSort $ map transactionNote ts
+      collator = Collate.collatorFor "en" (Collate.CollatorOptions {Collate.strength = Collate.Primary})
+      notes' = nubSortBy (Collate.compare collator) $ map transactionNote ts
   mapM_ T.putStrLn notes'

hledger/Hledger/Cli/Commands/Payees.hs

@@ -15,6 +15,8 @@ module Hledger.Cli.Commands.Payees (
 ) where
 
 import qualified Data.Set as S
+import Data.List.Extra (nubSortBy)
+import qualified Data.Text.Collate as Collate
 import qualified Data.Text.IO as T
 import System.Console.CmdArgs.Explicit as C
 
@@ -37,12 +39,14 @@ payees :: CliOpts -> Journal -> IO ()
 payees CliOpts{rawopts_=rawopts, reportspec_=ReportSpec{_rsQuery=query}} j = do
   let
     decl = boolopt "declared" rawopts
-    used     = boolopt "used"     rawopts
+    used = boolopt "used"     rawopts
     -- XXX matchesPayee is currently an alias for matchesDescription, not sure if it matters
     matcheddeclaredpayees = S.fromList . filter (matchesPayeeWIP query) $ journalPayeesDeclared j
     matchedusedpayees     = S.fromList . map transactionPayee $ filter (matchesTransaction query) $ jtxns j
     payees' =
       if | decl     && not used -> matcheddeclaredpayees
          | not decl && used     -> matchedusedpayees
          | otherwise            -> matcheddeclaredpayees <> matchedusedpayees
-  mapM_ T.putStrLn payees'
+    collator = Collate.collatorFor "en" (Collate.CollatorOptions {Collate.strength = Collate.Primary})
+    payees'' = nubSortBy (Collate.compare collator) payees'
+  mapM_ T.putStrLn payees''

hledger/hledger.cabal

@@ -194,6 +194,7 @@ library
     , time >=1.5
     , timeit
     , transformers
+    , unicode-collation
     , unordered-containers
     , utf8-string >=0.3.5
     , utility-ht >=0.0.13

hledger/package.yaml

@@ -157,6 +157,7 @@ dependencies:
 - time >=1.5
 - timeit
 - transformers
+- unicode-collation
 - unordered-containers
 - utf8-string >=0.3.5
 - utility-ht >=0.0.13

hledger/test/accounts-sorting.test

@@ -15,11 +15,19 @@
 2018/1/1
   (a:k)  1
 
+2018/1/1
+  (d:u)  1
+
+2018/1/1
+  (d:ö)  1
+
 $ hledger -f- acc
 a:k
 b:i
 b:j
 c
+d:ö
+d:u
 >=