lib,cli: Use Text for CompoundPeriodicReport titles.

hledger-lib/Hledger/Reports/ReportTypes.hs

@@ -32,9 +32,10 @@ module Hledger.Reports.ReportTypes
 , prrDepth
 ) where
 
-import Data.Aeson
-import Data.Decimal
+import Data.Aeson (ToJSON(..))
+import Data.Decimal (Decimal)
 import Data.Maybe (mapMaybe)
+import Data.Text (Text)
 #if !(MIN_VERSION_base(4,11,0))
 import Data.Semigroup (Semigroup(..))
 #endif
@@ -144,16 +145,16 @@ prrMapMaybeName f row = case f $ prrName row of
 -- It is used in compound balance report commands like balancesheet,
 -- cashflow and incomestatement.
 data CompoundPeriodicReport a b = CompoundPeriodicReport
-  { cbrTitle      :: String
+  { cbrTitle      :: Text
   , cbrDates      :: [DateSpan]
-  , cbrSubreports :: [(String, PeriodicReport a b, Bool)]
+  , cbrSubreports :: [(Text, PeriodicReport a b, Bool)]
   , cbrTotals     :: PeriodicReportRow () b
   } deriving (Show, Functor, Generic, ToJSON)
 
 -- | Description of one subreport within a compound balance report.
 -- Part of a "CompoundBalanceCommandSpec", but also used in hledger-lib.
 data CBCSubreportSpec a = CBCSubreportSpec
-  { cbcsubreporttitle          :: String                    -- ^ The title to use for the subreport
+  { cbcsubreporttitle          :: Text                      -- ^ The title to use for the subreport
   , cbcsubreportquery          :: Journal -> Query          -- ^ The Query to use for the subreport
   , cbcsubreportoptions        :: ReportOpts -> ReportOpts  -- ^ A function to transform the ReportOpts used to produce the subreport
   , cbcsubreporttransform      :: PeriodicReport DisplayName MixedAmount -> PeriodicReport a MixedAmount  -- ^ A function to transform the result of the subreport

hledger/Hledger/Cli/Commands/Balancesheet.hs

@@ -1,5 +1,6 @@
-{-# LANGUAGE RecordWildCards #-}
-{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE RecordWildCards   #-}
+{-# LANGUAGE TemplateHaskell   #-}
 {-|
 
 The @balancesheet@ command prints a simple balance sheet.

hledger/Hledger/Cli/Commands/Balancesheetequity.hs

@@ -1,5 +1,7 @@
-{-# LANGUAGE QuasiQuotes, RecordWildCards #-}
-{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE QuasiQuotes       #-}
+{-# LANGUAGE RecordWildCards   #-}
+{-# LANGUAGE TemplateHaskell   #-}
 {-|
 
 The @balancesheetequity@ command prints a simple balance sheet.

hledger/Hledger/Cli/Commands/Cashflow.hs

@@ -1,5 +1,7 @@
-{-# LANGUAGE QuasiQuotes, RecordWildCards #-}
-{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE QuasiQuotes       #-}
+{-# LANGUAGE RecordWildCards   #-}
+{-# LANGUAGE TemplateHaskell   #-}
 {-|
 
 The @cashflow@ command prints a simplified cashflow statement.  It just

hledger/Hledger/Cli/CompoundBalanceCommand.hs

@@ -149,7 +149,7 @@ compoundBalanceCommand CompoundBalanceCommandSpec{..} opts@CliOpts{reportspec_=r
 
     -- make a CompoundBalanceReport.
     cbr' = compoundBalanceReport rspec{rsOpts=ropts'} j cbcqueries
-    cbr  = cbr'{cbrTitle=T.unpack title}
+    cbr  = cbr'{cbrTitle=title}
 
     -- render appropriately
     render = case outputFormatFromOpts opts of
@@ -192,7 +192,7 @@ Balance Sheet
 compoundBalanceReportAsText :: ReportOpts -> CompoundPeriodicReport DisplayName MixedAmount -> String
 compoundBalanceReportAsText ropts
   (CompoundPeriodicReport title _colspans subreports (PeriodicReportRow _ coltotals grandtotal grandavg)) =
-    title ++ "\n\n" ++
+    T.unpack title ++ "\n\n" ++
     balanceReportTableAsText ropts bigtable'
   where
     bigtable =
@@ -218,7 +218,7 @@ compoundBalanceReportAsText ropts
         -- convert to table
         Table lefthdrs tophdrs cells = balanceReportAsTable ropts r
         -- tweak the layout
-        t = Table (Tab.Group SingleLine [Header title, lefthdrs]) tophdrs ([]:cells)
+        t = Table (Tab.Group SingleLine [Header $ T.unpack title, lefthdrs]) tophdrs ([]:cells)
 
 -- | Add the second table below the first, discarding its column headings.
 concatTables (Table hLeft hTop dat) (Table hLeft' _ dat') =
@@ -231,7 +231,7 @@ concatTables (Table hLeft hTop dat) (Table hLeft' _ dat') =
 compoundBalanceReportAsCsv :: ReportOpts -> CompoundPeriodicReport DisplayName MixedAmount -> CSV
 compoundBalanceReportAsCsv ropts (CompoundPeriodicReport title colspans subreports (PeriodicReportRow _ coltotals grandtotal grandavg)) =
     addtotals $
-      padRow (T.pack title)
+      padRow title
       : ( "Account"
         : map showDateSpanMonthAbbrev colspans
         ++ (if row_total_ ropts then ["Total"] else [])
@@ -241,7 +241,7 @@ compoundBalanceReportAsCsv ropts (CompoundPeriodicReport title colspans subrepor
   where
     -- | Add a subreport title row and drop the heading row.
     subreportAsCsv ropts (subreporttitle, multibalreport, _) =
-      padRow (T.pack subreporttitle) :
+      padRow subreporttitle :
       tail (multiBalanceReportAsCsv ropts multibalreport)
     padRow s = take numcols $ s : repeat ""
       where
@@ -288,7 +288,7 @@ compoundBalanceReportAsHtml ropts cbr =
 
     -- Make rows for a subreport: its title row, not the headings row,
     -- the data rows, any totals row, and a blank row for whitespace.
-    subreportrows :: (String, MultiBalanceReport, Bool) -> [Html ()]
+    subreportrows :: (T.Text, MultiBalanceReport, Bool) -> [Html ()]
     subreportrows (subreporttitle, mbr, _increasestotal) =
       let
         (_,bodyrows,mtotalsrow) = multiBalanceReportHtmlRows ropts mbr