Allow UTF8 in ledgers (account names, descriptions).

This patch fixes broken layout of some commands when there is Unicode
text in the ledger file.

I substituted System.IO functions with System.IO.UTF8. Now all strings
are Unicode internally, and take's and length's work correctly.
In particular, add, balance, hist, print and register commands seem
to work correctly; ui is still broken for me, I didn't try web.

I decode command line arguments from UTF8 forcefully, to permit
searches for accounts and descriptions with Unicode (otherwise, it
does not work).

The patch adds an additional dependency: utf8-string.

This patch does not include new test cases.

AddCommand.hs

@@ -7,10 +7,12 @@ An add command to help with data entry.
 module AddCommand
 where
 -- import Data.List.Utils (replace)
+import Prelude hiding (putStr, putStrLn, getLine, appendFile)
 import Ledger
 import Options
 import RegisterCommand (showRegisterReport)
-import System.IO
+import System.IO.UTF8
+import System.IO (stderr, hFlush)
 import System.IO.Error
 import Text.ParserCombinators.Parsec
 import Utils (ledgerFromStringWithOpts)

BalanceCommand.hs

@@ -96,6 +96,7 @@ balance report:
 
 module BalanceCommand
 where
+import Prelude hiding (putStr)
 import Ledger.Utils
 import Ledger.Types
 import Ledger.Amount
@@ -105,6 +106,7 @@ import Ledger.Ledger
 import Ledger.Parse
 import Options
 import Utils
+import System.IO.UTF8
 
 
 -- | Print a balance report.

HistogramCommand.hs

@@ -6,10 +6,12 @@ Print a histogram report.
 
 module HistogramCommand
 where
+import Prelude hiding (putStr)
 import qualified Data.Map as Map
 import Data.Map ((!))
 import Ledger
 import Options
+import System.IO.UTF8
 
 
 barchar = '*'
@@ -43,4 +45,4 @@ countBar ts = replicate (length ts) barchar
 
 total ts = show $ sumTransactions ts
 
--- totalBar ts = replicate (sumTransactions ts) barchar
+-- totalBar ts = replicate (sumTransactions ts) barchar

Ledger/Parse.hs

@@ -6,6 +6,7 @@ Parsers for standard ledger and timelog files.
 
 module Ledger.Parse
 where
+import Prelude hiding (readFile, putStr, print)
 import Control.Monad
 import Control.Monad.Error
 import Text.ParserCombinators.Parsec
@@ -14,7 +15,8 @@ import Text.ParserCombinators.Parsec.Language
 import Text.ParserCombinators.Parsec.Combinator
 import qualified Text.ParserCombinators.Parsec.Token as P
 import System.Directory
-import System.IO
+import System.IO.UTF8
+import System.IO (stdin)
 import qualified Data.Map as Map
 import Data.Time.LocalTime
 import Data.Time.Calendar

Ledger/Utils.hs

@@ -23,6 +23,7 @@ module Text.Regex,
 module Test.HUnit,
 )
 where
+import Prelude hiding (readFile)
 import Char
 import Control.Exception
 import Control.Monad
@@ -35,7 +36,7 @@ import Data.Time.Clock
 import Data.Time.Calendar
 import Data.Time.LocalTime
 import Debug.Trace
-import System.IO
+import System.IO.UTF8
 import Test.HUnit
 import Text.Printf
 import Text.Regex

Options.hs

@@ -18,6 +18,8 @@ import Ledger.Parse
 import Ledger.Utils
 import Ledger.Types
 import Ledger.Dates
+import Codec.Binary.UTF8.String (decodeString)
+import Control.Monad (liftM)
 
 progname      = "hledger"
 timeprogname  = "hours"
@@ -137,7 +139,7 @@ optValuesForConstructors fs opts = concatMap get opts
 -- as \"hours\", the -f $TIMELOG -p today options are assumed as a default.
 parseArguments :: IO ([Opt], String, [String])
 parseArguments = do
-  args <- getArgs
+  args <- liftM (map decodeString) getArgs
   let (os,as,es) = getOpt Permute options args
   istimequery <- usingTimeProgramName
   let os' = if istimequery then (Period "today"):os else os

PrintCommand.hs

@@ -6,8 +6,10 @@ A ledger-compatible @print@ command.
 
 module PrintCommand
 where
+import Prelude hiding (putStr)
 import Ledger
 import Options
+import System.IO.UTF8
 
 
 -- | Print ledger transactions in standard format.

RegisterCommand.hs

@@ -6,10 +6,12 @@ A ledger-compatible @register@ command.
 
 module RegisterCommand
 where
+import Prelude hiding (putStr)
 import qualified Data.Map as Map
 import Data.Map ((!))
 import Ledger
 import Options
+import System.IO.UTF8
 
 
 -- | Print a register report.

hledger.cabal

@@ -28,7 +28,7 @@ Flag happs
 
 Library
   Build-Depends:  base, containers, haskell98, directory, parsec, regex-compat,
-                  old-locale, time, HUnit, filepath
+                  old-locale, time, HUnit, filepath, utf8-string
 
   Exposed-modules:Ledger
                   Ledger.Account
@@ -53,7 +53,7 @@ Executable hledger
   Build-Depends:  base, containers, haskell98, directory, parsec,
                   regex-compat, regexpr>=0.5.1, old-locale, time,
                   HUnit, mtl, bytestring, filepath, process, testpack,
-                  regex-pcre, csv, split
+                  regex-pcre, csv, split, utf8-string
 
   Other-Modules:  
                   BalanceCommand

hledger.hs

@@ -51,9 +51,11 @@ module Main (
 #endif
 )
 where
+import Prelude hiding (putStr)
 import Control.Monad.Error
 import qualified Data.Map as Map (lookup)
-import System.IO
+import System.IO.UTF8
+import System.IO (stderr)
 
 import Version (versionmsg)
 import Ledger