slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev: rename AmountDisplayOpts -> AmountFormat, and related constants

Browse Source 
noColour          -> defaultFmt
noCost            -> noCostFmt
oneLine           -> oneLineFmt
csvDisplay        -> machineFmt
This commit is contained in:
Simon Michael 2024-01-23 11:28:19 -10:00
parent e2ed2b3b6d
commit 0cb382cf0e
17 changed files with 98 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hledger-lib/Hledger/Data/Account.hs
View File

@ -52,8 +52,8 @@ instance Show Account where
aname aname
(if aboring then "y" else "n" :: String) (if aboring then "y" else "n" :: String)
anumpostings anumpostings
(wbUnpack $ showMixedAmountB noColour aebalance) (wbUnpack $ showMixedAmountB defaultFmt aebalance)
(wbUnpack $ showMixedAmountB noColour aibalance) (wbUnpack $ showMixedAmountB defaultFmt aibalance)
instance Eq Account where instance Eq Account where
(==) a b = aname a == aname b -- quick equality test for speed (==) a b = aname a == aname b -- quick equality test for speed
@ -303,6 +303,6 @@ showAccountsBoringFlag = unlines . map (show . aboring) . flattenAccounts
showAccountDebug a = printf "%-25s %4s %4s %s" showAccountDebug a = printf "%-25s %4s %4s %s"
(aname a) (aname a)
(wbUnpack . showMixedAmountB noColour $ aebalance a) (wbUnpack . showMixedAmountB defaultFmt $ aebalance a)
(wbUnpack . showMixedAmountB noColour $ aibalance a) (wbUnpack . showMixedAmountB defaultFmt $ aibalance a)
(if aboring a then "b" else " " :: String) (if aboring a then "b" else " " :: String)

107
hledger-lib/Hledger/Data/Amount.hs
View File

@ -77,11 +77,11 @@ module Hledger.Data.Amount (
amountStylesSetRounding, amountStylesSetRounding,
amountUnstyled, amountUnstyled,
-- ** rendering -- ** rendering
AmountDisplayOpts(..), AmountFormat(..),
noColour, defaultFmt,
noCost, noCostFmt,
oneLine, oneLineFmt,
csvDisplay, machineFmt,
showAmountB, showAmountB,
showAmount, showAmount,
showAmountsCostB, showAmountsCostB,
@ -215,9 +215,10 @@ quoteCommoditySymbolIfNeeded s
| otherwise = s | otherwise = s
-- | Options for the display of Amount and MixedAmount. -- | Options for displaying Amounts and MixedAmounts.
-- (ee also Types.AmountStyle. -- Similar to "AmountStyle" but lower level.
data AmountDisplayOpts = AmountDisplayOpts -- See also hledger manual > "Amount formatting, parseability", which speaks of human, hledger, and machine output.
data AmountFormat = AmountFormat
{ displayCommodity :: Bool -- ^ Whether to display commodity symbols. { displayCommodity :: Bool -- ^ Whether to display commodity symbols.
, displayZeroCommodity :: Bool -- ^ Whether to display commodity symbols for zero Amounts. , displayZeroCommodity :: Bool -- ^ Whether to display commodity symbols for zero Amounts.
, displayCommodityOrder :: Maybe [CommoditySymbol] , displayCommodityOrder :: Maybe [CommoditySymbol]
@ -234,17 +235,17 @@ data AmountDisplayOpts = AmountDisplayOpts
, displayColour :: Bool -- ^ Whether to ansi-colourise negative Amounts. , displayColour :: Bool -- ^ Whether to ansi-colourise negative Amounts.
} deriving (Show) } deriving (Show)
-- | By default, display Amount and MixedAmount using @noColour@ amount display options. -- | By default, display amounts using @defaultFmt@ amount display options.
instance Default AmountDisplayOpts where def = noColour instance Default AmountFormat where def = defaultFmt
-- | Display amounts without colour, and with various other defaults. -- | Display amounts without colour, and with various other defaults.
noColour :: AmountDisplayOpts defaultFmt :: AmountFormat
noColour = AmountDisplayOpts { defaultFmt = AmountFormat {
displayCommodity = True displayCommodity = True
, displayZeroCommodity = False , displayZeroCommodity = False
, displayCommodityOrder = Nothing , displayCommodityOrder = Nothing
, displayDigitGroups = True , displayDigitGroups = True
, displayForceDecimalMark = False , displayForceDecimalMark = False
, displayOneLine = False , displayOneLine = False
, displayMinWidth = Just 0 , displayMinWidth = Just 0
, displayMaxWidth = Nothing , displayMaxWidth = Nothing
@ -252,17 +253,17 @@ noColour = AmountDisplayOpts {
, displayColour = False , displayColour = False
} }
-- | Display Amount and MixedAmount with no costs. -- | Like defaultFmt but don't show costs.
noCost :: AmountDisplayOpts noCostFmt :: AmountFormat
noCost = def{displayCost=False} noCostFmt = defaultFmt{displayCost=False}
-- | Display Amount and MixedAmount on one line with no costs. -- | Like noCostFmt but display amounts on one line rather than several.
oneLine :: AmountDisplayOpts oneLineFmt :: AmountFormat
oneLine = def{displayOneLine=True, displayCost=False} oneLineFmt = noCostFmt{displayOneLine=True}
-- | Display Amount and MixedAmount in a form suitable for CSV output. -- | A (slightly more) machine-readable amount format; like oneLineFmt but don't show digit group marks.
csvDisplay :: AmountDisplayOpts machineFmt :: AmountFormat
csvDisplay = oneLine{displayDigitGroups=False} machineFmt = oneLineFmt{displayDigitGroups=False}
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
-- Amount arithmetic -- Amount arithmetic
@ -621,8 +622,8 @@ withDecimalPoint = flip setAmountDecimalPoint
showAmountsCostB :: Amount -> WideBuilder showAmountsCostB :: Amount -> WideBuilder
showAmountsCostB amt = case acost amt of showAmountsCostB amt = case acost amt of
Nothing -> mempty Nothing -> mempty
Just (UnitCost pa) -> WideBuilder (TB.fromString " @ ") 3 <> showAmountB noColour{displayZeroCommodity=True} pa Just (UnitCost pa) -> WideBuilder (TB.fromString " @ ") 3 <> showAmountB defaultFmt{displayZeroCommodity=True} pa
Just (TotalCost pa) -> WideBuilder (TB.fromString " @@ ") 4 <> showAmountB noColour{displayZeroCommodity=True} (sign pa) Just (TotalCost pa) -> WideBuilder (TB.fromString " @@ ") 4 <> showAmountB defaultFmt{displayZeroCommodity=True} (sign pa)
where sign = if aquantity amt < 0 then negate else id where sign = if aquantity amt < 0 then negate else id
showAmountCostDebug :: Maybe AmountCost -> String showAmountCostDebug :: Maybe AmountCost -> String
@ -635,12 +636,12 @@ showAmountCostDebug (Just (TotalCost pa)) = " @@ " ++ showAmountDebug pa
-- zero are converted to just \"0\". The special "missing" amount is -- zero are converted to just \"0\". The special "missing" amount is
-- displayed as the empty string. -- displayed as the empty string.
-- --
-- > showAmount = wbUnpack . showAmountB noColour -- > showAmount = wbUnpack . showAmountB defaultFmt
showAmount :: Amount -> String showAmount :: Amount -> String
showAmount = wbUnpack . showAmountB noColour showAmount = wbUnpack . showAmountB defaultFmt
-- | General function to generate a WideBuilder for an Amount, according the -- | General function to generate a WideBuilder for an Amount, according the
-- supplied AmountDisplayOpts. This is the main function to use for showing -- supplied AmountFormat. This is the main function to use for showing
-- Amounts, constructing a builder; it can then be converted to a Text with -- Amounts, constructing a builder; it can then be converted to a Text with
-- wbToText, or to a String with wbUnpack. -- wbToText, or to a String with wbUnpack.
-- Some special cases: -- Some special cases:
@ -651,10 +652,10 @@ showAmount = wbUnpack . showAmountB noColour
-- we force showing a decimal mark (with nothing after it) to make -- we force showing a decimal mark (with nothing after it) to make
-- it easier to parse correctly. -- it easier to parse correctly.
-- --
showAmountB :: AmountDisplayOpts -> Amount -> WideBuilder showAmountB :: AmountFormat -> Amount -> WideBuilder
showAmountB _ Amount{acommodity="AUTO"} = mempty showAmountB _ Amount{acommodity="AUTO"} = mempty
showAmountB showAmountB
AmountDisplayOpts{displayCommodity, displayZeroCommodity, displayDigitGroups AmountFormat{displayCommodity, displayZeroCommodity, displayDigitGroups
,displayForceDecimalMark, displayCost, displayColour} ,displayForceDecimalMark, displayCost, displayColour}
a@Amount{astyle=style} = a@Amount{astyle=style} =
color $ case ascommodityside style of color $ case ascommodityside style of
@ -679,15 +680,15 @@ cshowAmount = wbUnpack . showAmountB def{displayColour=True}
-- | Get the string representation of an amount, without any \@ cost. -- | Get the string representation of an amount, without any \@ cost.
-- --
-- > showAmountWithoutCost = wbUnpack . showAmountB noCost -- > showAmountWithoutCost = wbUnpack . showAmountB noCostFmt
showAmountWithoutCost :: Amount -> String showAmountWithoutCost :: Amount -> String
showAmountWithoutCost = wbUnpack . showAmountB noCost showAmountWithoutCost = wbUnpack . showAmountB noCostFmt
-- | Like showAmount, but show a zero amount's commodity if it has one. -- | Like showAmount, but show a zero amount's commodity if it has one.
-- --
-- > showAmountWithZeroCommodity = wbUnpack . showAmountB noColour{displayZeryCommodity=True} -- > showAmountWithZeroCommodity = wbUnpack . showAmountB defaultFmt{displayZeryCommodity=True}
showAmountWithZeroCommodity :: Amount -> String showAmountWithZeroCommodity :: Amount -> String
showAmountWithZeroCommodity = wbUnpack . showAmountB noColour{displayZeroCommodity=True} showAmountWithZeroCommodity = wbUnpack . showAmountB defaultFmt{displayZeroCommodity=True}
-- | Get a string representation of an amount for debugging, -- | Get a string representation of an amount for debugging,
-- appropriate to the current debug level. 9 shows maximum detail. -- appropriate to the current debug level. 9 shows maximum detail.
@ -1026,45 +1027,45 @@ mixedAmountUnstyled = mapMixedAmountUnsafe amountUnstyled
-- normalising it to one amount per commodity. Assumes amounts have -- normalising it to one amount per commodity. Assumes amounts have
-- no or similar costs, otherwise this can show misleading costs. -- no or similar costs, otherwise this can show misleading costs.
-- --
-- > showMixedAmount = wbUnpack . showMixedAmountB noColour -- > showMixedAmount = wbUnpack . showMixedAmountB defaultFmt
showMixedAmount :: MixedAmount -> String showMixedAmount :: MixedAmount -> String
showMixedAmount = wbUnpack . showMixedAmountB noColour showMixedAmount = wbUnpack . showMixedAmountB defaultFmt
-- | Get the one-line string representation of a mixed amount (also showing any costs). -- | Get the one-line string representation of a mixed amount (also showing any costs).
-- --
-- > showMixedAmountOneLine = wbUnpack . showMixedAmountB oneLine -- > showMixedAmountOneLine = wbUnpack . showMixedAmountB oneLineFmt
showMixedAmountOneLine :: MixedAmount -> String showMixedAmountOneLine :: MixedAmount -> String
showMixedAmountOneLine = wbUnpack . showMixedAmountB oneLine{displayCost=True} showMixedAmountOneLine = wbUnpack . showMixedAmountB oneLineFmt{displayCost=True}
-- | Like showMixedAmount, but zero amounts are shown with their -- | Like showMixedAmount, but zero amounts are shown with their
-- commodity if they have one. -- commodity if they have one.
-- --
-- > showMixedAmountWithZeroCommodity = wbUnpack . showMixedAmountB noColour{displayZeroCommodity=True} -- > showMixedAmountWithZeroCommodity = wbUnpack . showMixedAmountB defaultFmt{displayZeroCommodity=True}
showMixedAmountWithZeroCommodity :: MixedAmount -> String showMixedAmountWithZeroCommodity :: MixedAmount -> String
showMixedAmountWithZeroCommodity = wbUnpack . showMixedAmountB noColour{displayZeroCommodity=True} showMixedAmountWithZeroCommodity = wbUnpack . showMixedAmountB defaultFmt{displayZeroCommodity=True}
-- | Get the string representation of a mixed amount, without showing any costs. -- | Get the string representation of a mixed amount, without showing any costs.
-- With a True argument, adds ANSI codes to show negative amounts in red. -- With a True argument, adds ANSI codes to show negative amounts in red.
-- --
-- > showMixedAmountWithoutCost c = wbUnpack . showMixedAmountB noCost{displayColour=c} -- > showMixedAmountWithoutCost c = wbUnpack . showMixedAmountB noCostFmt{displayColour=c}
showMixedAmountWithoutCost :: Bool -> MixedAmount -> String showMixedAmountWithoutCost :: Bool -> MixedAmount -> String
showMixedAmountWithoutCost c = wbUnpack . showMixedAmountB noCost{displayColour=c} showMixedAmountWithoutCost c = wbUnpack . showMixedAmountB noCostFmt{displayColour=c}
-- | Get the one-line string representation of a mixed amount, but without -- | Get the one-line string representation of a mixed amount, but without
-- any \@ costs. -- any \@ costs.
-- With a True argument, adds ANSI codes to show negative amounts in red. -- With a True argument, adds ANSI codes to show negative amounts in red.
-- --
-- > showMixedAmountOneLineWithoutCost c = wbUnpack . showMixedAmountB oneLine{displayColour=c} -- > showMixedAmountOneLineWithoutCost c = wbUnpack . showMixedAmountB oneLineFmt{displayColour=c}
showMixedAmountOneLineWithoutCost :: Bool -> MixedAmount -> String showMixedAmountOneLineWithoutCost :: Bool -> MixedAmount -> String
showMixedAmountOneLineWithoutCost c = wbUnpack . showMixedAmountB oneLine{displayColour=c} showMixedAmountOneLineWithoutCost c = wbUnpack . showMixedAmountB oneLineFmt{displayColour=c}
-- | Like showMixedAmountOneLineWithoutCost, but show at most the given width, -- | Like showMixedAmountOneLineWithoutCost, but show at most the given width,
-- with an elision indicator if there are more. -- with an elision indicator if there are more.
-- With a True argument, adds ANSI codes to show negative amounts in red. -- With a True argument, adds ANSI codes to show negative amounts in red.
-- --
-- > showMixedAmountElided w c = wbUnpack . showMixedAmountB oneLine{displayColour=c, displayMaxWidth=Just w} -- > showMixedAmountElided w c = wbUnpack . showMixedAmountB oneLineFmt{displayColour=c, displayMaxWidth=Just w}
showMixedAmountElided :: Int -> Bool -> MixedAmount -> String showMixedAmountElided :: Int -> Bool -> MixedAmount -> String
showMixedAmountElided w c = wbUnpack . showMixedAmountB oneLine{displayColour=c, displayMaxWidth=Just w} showMixedAmountElided w c = wbUnpack . showMixedAmountB oneLineFmt{displayColour=c, displayMaxWidth=Just w}
-- | Get an unambiguous string representation of a mixed amount for debugging. -- | Get an unambiguous string representation of a mixed amount for debugging.
showMixedAmountDebug :: MixedAmount -> String showMixedAmountDebug :: MixedAmount -> String
@ -1073,7 +1074,7 @@ showMixedAmountDebug m | m == missingmixedamt = "(missing)"
where as = intercalate "\n " $ map showAmountDebug $ amounts m where as = intercalate "\n " $ map showAmountDebug $ amounts m
-- | General function to generate a WideBuilder for a MixedAmount, according to the -- | General function to generate a WideBuilder for a MixedAmount, according to the
-- supplied AmountDisplayOpts. This is the main function to use for showing -- supplied AmountFormat. This is the main function to use for showing
-- MixedAmounts, constructing a builder; it can then be converted to a Text with -- MixedAmounts, constructing a builder; it can then be converted to a Text with
-- wbToText, or to a String with wbUnpack. -- wbToText, or to a String with wbUnpack.
-- --
@ -1084,7 +1085,7 @@ showMixedAmountDebug m | m == missingmixedamt = "(missing)"
-- exceed the requested maximum width. -- exceed the requested maximum width.
-- - If displayed on multiple lines, any Amounts longer than the -- - If displayed on multiple lines, any Amounts longer than the
-- maximum width will be elided. -- maximum width will be elided.
showMixedAmountB :: AmountDisplayOpts -> MixedAmount -> WideBuilder showMixedAmountB :: AmountFormat -> MixedAmount -> WideBuilder
showMixedAmountB opts ma showMixedAmountB opts ma
| displayOneLine opts = showMixedAmountOneLineB opts ma | displayOneLine opts = showMixedAmountOneLineB opts ma
| otherwise = WideBuilder (wbBuilder . mconcat $ intersperse sep ls) width | otherwise = WideBuilder (wbBuilder . mconcat $ intersperse sep ls) width
@ -1096,8 +1097,8 @@ showMixedAmountB opts ma
-- | Helper for showMixedAmountB (and postingAsLines, ...) to show a list of Amounts on multiple lines. -- | Helper for showMixedAmountB (and postingAsLines, ...) to show a list of Amounts on multiple lines.
-- This returns the list of WideBuilders: one for each Amount, and padded/elided to the appropriate width. -- This returns the list of WideBuilders: one for each Amount, and padded/elided to the appropriate width.
-- This does not honour displayOneLine; all amounts will be displayed as if displayOneLine were False. -- This does not honour displayOneLine; all amounts will be displayed as if displayOneLine were False.
showMixedAmountLinesB :: AmountDisplayOpts -> MixedAmount -> [WideBuilder] showMixedAmountLinesB :: AmountFormat -> MixedAmount -> [WideBuilder]
showMixedAmountLinesB opts@AmountDisplayOpts{displayMaxWidth=mmax,displayMinWidth=mmin} ma = showMixedAmountLinesB opts@AmountFormat{displayMaxWidth=mmax,displayMinWidth=mmin} ma =
map (adBuilder . pad) elided map (adBuilder . pad) elided
where where
astrs = amtDisplayList (wbWidth sep) (showAmountB opts) . orderedAmounts opts $ astrs = amtDisplayList (wbWidth sep) (showAmountB opts) . orderedAmounts opts $
@ -1120,8 +1121,8 @@ showMixedAmountLinesB opts@AmountDisplayOpts{displayMaxWidth=mmax,displayMinWidt
-- | Helper for showMixedAmountB to deal with single line displays. This does not -- | Helper for showMixedAmountB to deal with single line displays. This does not
-- honour displayOneLine: all amounts will be displayed as if displayOneLine -- honour displayOneLine: all amounts will be displayed as if displayOneLine
-- were True. -- were True.
showMixedAmountOneLineB :: AmountDisplayOpts -> MixedAmount -> WideBuilder showMixedAmountOneLineB :: AmountFormat -> MixedAmount -> WideBuilder
showMixedAmountOneLineB opts@AmountDisplayOpts{displayMaxWidth=mmax,displayMinWidth=mmin} ma = showMixedAmountOneLineB opts@AmountFormat{displayMaxWidth=mmax,displayMinWidth=mmin} ma =
WideBuilder (wbBuilder . pad . mconcat . intersperse sep $ map adBuilder elided) WideBuilder (wbBuilder . pad . mconcat . intersperse sep $ map adBuilder elided)
. max width $ fromMaybe 0 mmin . max width $ fromMaybe 0 mmin
where where
@ -1152,8 +1153,8 @@ showMixedAmountOneLineB opts@AmountDisplayOpts{displayMaxWidth=mmax,displayMinWi
-- Get a mixed amount's component amounts with a bit of cleanup, -- Get a mixed amount's component amounts with a bit of cleanup,
-- optionally preserving multiple zeros in different commodities, -- optionally preserving multiple zeros in different commodities,
-- optionally sorting them according to a commodity display order. -- optionally sorting them according to a commodity display order.
orderedAmounts :: AmountDisplayOpts -> MixedAmount -> [Amount] orderedAmounts :: AmountFormat -> MixedAmount -> [Amount]
orderedAmounts AmountDisplayOpts{displayZeroCommodity=preservezeros, displayCommodityOrder=mcommodityorder} = orderedAmounts AmountFormat{displayZeroCommodity=preservezeros, displayCommodityOrder=mcommodityorder} =
if preservezeros then amountsPreservingZeros else amounts if preservezeros then amountsPreservingZeros else amounts
<&> maybe id (mapM findfirst) mcommodityorder -- maybe sort them (somehow..) <&> maybe id (mapM findfirst) mcommodityorder -- maybe sort them (somehow..)
where where

4
hledger-lib/Hledger/Data/Posting.hs
View File

@ -292,7 +292,7 @@ postingAsLines elideamount onelineamounts acctwidth amtwidth p =
shownAmounts shownAmounts
| elideamount = [mempty] | elideamount = [mempty]
| otherwise = showMixedAmountLinesB displayopts $ pamount p | otherwise = showMixedAmountLinesB displayopts $ pamount p
where displayopts = noColour{ where displayopts = defaultFmt{
displayZeroCommodity=True, displayForceDecimalMark=True, displayOneLine=onelineamounts displayZeroCommodity=True, displayForceDecimalMark=True, displayOneLine=onelineamounts
} }
thisamtwidth = maximumBound 0 $ map wbWidth shownAmounts thisamtwidth = maximumBound 0 $ map wbWidth shownAmounts
@ -361,7 +361,7 @@ postingAsLinesBeancount elideamount acctwidth amtwidth p =
| elideamount = [mempty] | elideamount = [mempty]
| otherwise = showMixedAmountLinesB displayopts a' | otherwise = showMixedAmountLinesB displayopts a'
where where
displayopts = noColour{ displayZeroCommodity=True, displayForceDecimalMark=True } displayopts = defaultFmt{ displayZeroCommodity=True, displayForceDecimalMark=True }
a' = mapMixedAmount amountToBeancount $ pamount p a' = mapMixedAmount amountToBeancount $ pamount p
thisamtwidth = maximumBound 0 $ map wbWidth shownAmounts thisamtwidth = maximumBound 0 $ map wbWidth shownAmounts

11
hledger-lib/Hledger/Data/Types.hs
View File

@ -250,8 +250,13 @@ data AmountCost = UnitCost !Amount | TotalCost !Amount
deriving (Eq,Ord,Generic,Show) deriving (Eq,Ord,Generic,Show)
-- | Every Amount has one of these, influencing how the amount is displayed. -- | Every Amount has one of these, influencing how the amount is displayed.
-- Also, each Commodity can have one, which can be applied to its amounts for consistent display. -- Also each Commodity has one, inferred from the corresponding amounts, directives and options,
-- See also Amount.AmountDisplayOpts. -- then applied to all of its amounts for consistent display.
-- Similar to "AmountFormat" but higher level.
-- See also:
-- - hledger manual > Commodity styles
-- - hledger manual > Amounts
-- - hledger manual > Commodity display style
data AmountStyle = AmountStyle { data AmountStyle = AmountStyle {
ascommodityside :: !Side, -- ^ show the symbol on the left or the right ? ascommodityside :: !Side, -- ^ show the symbol on the left or the right ?
ascommodityspaced :: !Bool, -- ^ show a space between symbol and quantity ? ascommodityspaced :: !Bool, -- ^ show a space between symbol and quantity ?
@ -261,7 +266,7 @@ data AmountStyle = AmountStyle {
asrounding :: !Rounding -- ^ "rounding strategy" - kept here for convenience, for now: asrounding :: !Rounding -- ^ "rounding strategy" - kept here for convenience, for now:
-- when displaying an amount, it is ignored, -- when displaying an amount, it is ignored,
-- but when applying this style to another amount, it determines -- but when applying this style to another amount, it determines
-- how hard we should try to adjust the amount's display precision. -- how hard we should try to adjust that amount's display precision.
} deriving (Eq,Ord,Read,Generic) } deriving (Eq,Ord,Read,Generic)
instance Show AmountStyle where instance Show AmountStyle where

2
hledger-lib/Hledger/Read/RulesReader.hs
View File

@ -1747,7 +1747,7 @@ getAmount rules record currency p1IsVirtual n =
] ++ ] ++
["rule \"" <> f <> " " <> ["rule \"" <> f <> " " <>
fromMaybe "" (hledgerField rules record f) <> fromMaybe "" (hledgerField rules record f) <>
"\" assigned value \"" <> wbToText (showMixedAmountB noColour a) <> "\"" -- XXX not sure this is showing all the right info "\" assigned value \"" <> wbToText (showMixedAmountB defaultFmt a) <> "\"" -- XXX not sure this is showing all the right info
| (f,a) <- fs | (f,a) <- fs
] ++ ] ++
["" [""

8
hledger-lib/Hledger/Reports/BudgetReport.hs
View File

@ -337,9 +337,9 @@ budgetReportAsTable
rowfuncs :: [CommoditySymbol] -> (BudgetShowMixed, BudgetPercBudget) rowfuncs :: [CommoditySymbol] -> (BudgetShowMixed, BudgetPercBudget)
rowfuncs cs = case layout_ of rowfuncs cs = case layout_ of
LayoutWide width -> LayoutWide width ->
( pure . showMixedAmountB oneLine{displayMaxWidth=width, displayColour=color_} ( pure . showMixedAmountB oneLineFmt{displayMaxWidth=width, displayColour=color_}
, \a -> pure . percentage a) , \a -> pure . percentage a)
_ -> ( showMixedAmountLinesB noCost{displayCommodity=layout_/=LayoutBare, displayCommodityOrder=Just cs, displayMinWidth=Nothing, displayColour=color_} _ -> ( showMixedAmountLinesB noCostFmt{displayCommodity=layout_/=LayoutBare, displayCommodityOrder=Just cs, displayMinWidth=Nothing, displayColour=color_}
, \a b -> fmap (percentage' a b) cs) , \a b -> fmap (percentage' a b) cs)
showrow :: [BudgetCell] -> [(WideBuilder, BudgetDisplayRow)] showrow :: [BudgetCell] -> [(WideBuilder, BudgetDisplayRow)]
@ -466,7 +466,7 @@ budgetReportAsCsv
where where
flattentuples tups = concat [[a,b] | (a,b) <- tups] flattentuples tups = concat [[a,b] | (a,b) <- tups]
showNorm = maybe "" (wbToText . showMixedAmountB oneLine) showNorm = maybe "" (wbToText . showMixedAmountB oneLineFmt)
rowAsTexts :: (PeriodicReportRow a BudgetCell -> Text) rowAsTexts :: (PeriodicReportRow a BudgetCell -> Text)
-> PeriodicReportRow a BudgetCell -> PeriodicReportRow a BudgetCell
@ -480,7 +480,7 @@ budgetReportAsCsv
$ vals $ vals
where where
cs = S.toList . foldl' S.union mempty . fmap maCommodities $ catMaybes vals cs = S.toList . foldl' S.union mempty . fmap maCommodities $ catMaybes vals
dopts = oneLine{displayCommodity=layout_ /= LayoutBare, displayCommodityOrder=Just cs, displayMinWidth=Nothing} dopts = oneLineFmt{displayCommodity=layout_ /= LayoutBare, displayCommodityOrder=Just cs, displayMinWidth=Nothing}
vals = flattentuples as vals = flattentuples as
++ concat [[rowtot, budgettot] | row_total_] ++ concat [[rowtot, budgettot] | row_total_]
++ concat [[rowavg, budgetavg] | average_] ++ concat [[rowavg, budgetavg] | average_]

4
hledger-ui/Hledger/UI/AccountsScreen.hs
View File

@ -80,7 +80,7 @@ asDrawHelper UIState{aScreen=scr, aopts=uopts, ajournal=j, aMode=mode} ropts scr
displayitems = ass ^. assList . listElementsL displayitems = ass ^. assList . listElementsL
acctwidths = V.map (\AccountsScreenItem{..} -> asItemIndentLevel + realLength asItemDisplayAccountName) displayitems acctwidths = V.map (\AccountsScreenItem{..} -> asItemIndentLevel + realLength asItemDisplayAccountName) displayitems
balwidths = V.map (maybe 0 (wbWidth . showMixedAmountB oneLine) . asItemMixedAmount) displayitems balwidths = V.map (maybe 0 (wbWidth . showMixedAmountB oneLineFmt) . asItemMixedAmount) displayitems
preferredacctwidth = V.maximum acctwidths preferredacctwidth = V.maximum acctwidths
totalacctwidthseen = V.sum acctwidths totalacctwidthseen = V.sum acctwidths
preferredbalwidth = V.maximum balwidths preferredbalwidth = V.maximum balwidths
@ -169,7 +169,7 @@ asDrawItem (acctwidth, balwidth) selected AccountsScreenItem{..} =
splitAmounts balBuilder splitAmounts balBuilder
where where
balBuilder = maybe mempty showamt asItemMixedAmount balBuilder = maybe mempty showamt asItemMixedAmount
showamt = showMixedAmountB oneLine{displayMinWidth=Just balwidth, displayMaxWidth=Just balwidth} showamt = showMixedAmountB oneLineFmt{displayMinWidth=Just balwidth, displayMaxWidth=Just balwidth}
balspace = T.replicate (2 + balwidth - wbWidth balBuilder) " " balspace = T.replicate (2 + balwidth - wbWidth balBuilder) " "
splitAmounts = foldr1 (<+>) . intersperse (str ", ") . map renderamt . T.splitOn ", " . wbToText splitAmounts = foldr1 (<+>) . intersperse (str ", ") . map renderamt . T.splitOn ", " . wbToText
renderamt :: T.Text -> Widget Name renderamt :: T.Text -> Widget Name

2
hledger-ui/Hledger/UI/UIScreens.hs
View File

@ -291,7 +291,7 @@ rsUpdate uopts d j rss@RSS{_rssAccount, _rssForceInclusive, _rssList=oldlist} =
,rsItemTransaction = t ,rsItemTransaction = t
} }
where where
showamt = showMixedAmountB oneLine{displayMaxWidth=Just 3} showamt = showMixedAmountB oneLineFmt{displayMaxWidth=Just 3}
wd = whichDate ropts' wd = whichDate ropts'
-- blank items are added to allow more control of scroll position; we won't allow movement over these. -- blank items are added to allow more control of scroll position; we won't allow movement over these.

2
hledger-web/Hledger/Web/Handler/RegisterR.hs
View File

@ -110,7 +110,7 @@ registerChartHtml q title percommoditytxnreports = $(hamletFile "templates/chart
colorForCommodity = fromMaybe 0 . flip lookup commoditiesIndex colorForCommodity = fromMaybe 0 . flip lookup commoditiesIndex
commoditiesIndex = zip (map fst percommoditytxnreports) [0..] :: [(CommoditySymbol,Int)] commoditiesIndex = zip (map fst percommoditytxnreports) [0..] :: [(CommoditySymbol,Int)]
simpleMixedAmountQuantity = maybe 0 aquantity . listToMaybe . amounts . mixedAmountStripCosts simpleMixedAmountQuantity = maybe 0 aquantity . listToMaybe . amounts . mixedAmountStripCosts
showZeroCommodity = wbUnpack . showMixedAmountB oneLine{displayCost=False,displayZeroCommodity=True} showZeroCommodity = wbUnpack . showMixedAmountB oneLineFmt{displayCost=False,displayZeroCommodity=True}
shownull c = if null c then " " else c shownull c = if null c then " " else c
nodatelink = (RegisterR, [("q", T.unwords $ removeDates q)]) nodatelink = (RegisterR, [("q", T.unwords $ removeDates q)])

2
hledger/Hledger/Cli/Commands/Add.hs
View File

@ -361,7 +361,7 @@ amountAndCommentWizard PrevInput{..} EntryState{..} = do
return (a,c) return (a,c)
balancingamt = maNegate . sumPostings $ filter isReal esPostings balancingamt = maNegate . sumPostings $ filter isReal esPostings
balancingamtfirstcommodity = mixed . take 1 $ amounts balancingamt balancingamtfirstcommodity = mixed . take 1 $ amounts balancingamt
showamt = wbUnpack . showMixedAmountB noColour . mixedAmountSetPrecision showamt = wbUnpack . showMixedAmountB defaultFmt . mixedAmountSetPrecision
-- what should this be ? -- what should this be ?
-- 1 maxprecision (show all decimal places or none) ? -- 1 maxprecision (show all decimal places or none) ?
-- 2 maxprecisionwithpoint (show all decimal places or .0 - avoids some but not all confusion with thousands separators) ? -- 2 maxprecisionwithpoint (show all decimal places or .0 - avoids some but not all confusion with thousands separators) ?

10
hledger/Hledger/Cli/Commands/Aregister.hs
View File

@ -128,8 +128,8 @@ accountTransactionsReportItemAsCsvRecord
where where
idx = T.pack $ show tindex idx = T.pack $ show tindex
date = showDate $ transactionRegisterDate wd reportq thisacctq t date = showDate $ transactionRegisterDate wd reportq thisacctq t
amt = wbToText $ showMixedAmountB csvDisplay change amt = wbToText $ showMixedAmountB machineFmt change
bal = wbToText $ showMixedAmountB csvDisplay balance bal = wbToText $ showMixedAmountB machineFmt balance
-- | Render a register report as a HTML snippet. -- | Render a register report as a HTML snippet.
accountTransactionsReportAsHTML :: CliOpts -> Query -> Query -> AccountTransactionsReport -> TL.Text accountTransactionsReportAsHTML :: CliOpts -> Query -> Query -> AccountTransactionsReport -> TL.Text
@ -148,9 +148,9 @@ htmlRow CliOpts{reportspec_=ReportSpec{_rsReportOpts=ropts}} reportq thisacctq
L.tr_ (do (L.td_ . toHtml . show . transactionRegisterDate (whichDate ropts) reportq thisacctq) t L.tr_ (do (L.td_ . toHtml . show . transactionRegisterDate (whichDate ropts) reportq thisacctq) t
(L.td_ . toHtml) tdescription (L.td_ . toHtml) tdescription
(L.td_ . toHtml) otheracctsstr (L.td_ . toHtml) otheracctsstr
-- piggy back on the oneLine display style for now. -- piggy back on the oneLineFmt display style for now.
(L.td_ . toHtml . wbUnpack . showMixedAmountB oneLine) amt (L.td_ . toHtml . wbUnpack . showMixedAmountB oneLineFmt) amt
(L.td_ . toHtml . wbUnpack . showMixedAmountB oneLine) bal) (L.td_ . toHtml . wbUnpack . showMixedAmountB oneLineFmt) bal)
-- | Render a register report as plain text suitable for console output. -- | Render a register report as plain text suitable for console output.
accountTransactionsReportAsText :: CliOpts -> Query -> Query -> AccountTransactionsReport -> TL.Text accountTransactionsReportAsText :: CliOpts -> Query -> Query -> AccountTransactionsReport -> TL.Text

12
hledger/Hledger/Cli/Commands/Balance.hs
View File

@ -435,7 +435,7 @@ balanceReportAsCsv opts (items, total) =
showName = accountNameDrop (drop_ opts) showName = accountNameDrop (drop_ opts)
renderAmount amt = wbToText $ showMixedAmountB bopts amt renderAmount amt = wbToText $ showMixedAmountB bopts amt
where where
bopts = csvDisplay{displayCommodity=showcomm, displayCommodityOrder = commorder} bopts = machineFmt{displayCommodity=showcomm, displayCommodityOrder = commorder}
(showcomm, commorder) (showcomm, commorder)
| layout_ opts == LayoutBare = (False, Just $ S.toList $ maCommodities amt) | layout_ opts == LayoutBare = (False, Just $ S.toList $ maCommodities amt)
| otherwise = (True, Nothing) | otherwise = (True, Nothing)
@ -470,7 +470,7 @@ balanceReportAsText' opts ((items, total)) =
[ Cell TopRight damts [ Cell TopRight damts
, Cell TopLeft (fmap wbFromText cs) , Cell TopLeft (fmap wbFromText cs)
, Cell TopLeft (replicate (length damts - 1) mempty ++ [wbFromText dispname]) ] , Cell TopLeft (replicate (length damts - 1) mempty ++ [wbFromText dispname]) ]
where dopts = oneLine{displayCommodity=layout_ opts /= LayoutBare, displayCommodityOrder=Just cs, displayColour=color_ opts} where dopts = oneLineFmt{displayCommodity=layout_ opts /= LayoutBare, displayCommodityOrder=Just cs, displayColour=color_ opts}
cs = if mixedAmountLooksZero amt then [""] else S.toList $ maCommodities amt cs = if mixedAmountLooksZero amt then [""] else S.toList $ maCommodities amt
dispname = T.replicate ((dep - 1) * 2) " " <> acctname dispname = T.replicate ((dep - 1) * 2) " " <> acctname
damts = showMixedAmountLinesB dopts amt damts = showMixedAmountLinesB dopts amt
@ -527,7 +527,7 @@ renderComponent topaligned oneline opts (acctname, dep, total) (FormatField ljus
| topaligned = TopRight | topaligned = TopRight
| ljust = BottomLeft | ljust = BottomLeft
| otherwise = BottomRight | otherwise = BottomRight
dopts = noCost{displayCommodity = layout_ opts /= LayoutBare dopts = noCostFmt{displayCommodity = layout_ opts /= LayoutBare
,displayOneLine = oneline ,displayOneLine = oneline
,displayMinWidth = mmin ,displayMinWidth = mmin
,displayMaxWidth = mmax ,displayMaxWidth = mmax
@ -736,7 +736,7 @@ balanceReportAsTable opts@ReportOpts{summary_only_, average_, row_total_, balanc
maybetranspose | transpose_ opts = \(Table rh ch vals) -> Table ch rh (transpose vals) maybetranspose | transpose_ opts = \(Table rh ch vals) -> Table ch rh (transpose vals)
| otherwise = id | otherwise = id
multiBalanceRowAsWbs :: AmountDisplayOpts -> ReportOpts -> [DateSpan] -> PeriodicReportRow a MixedAmount -> [[WideBuilder]] multiBalanceRowAsWbs :: AmountFormat -> ReportOpts -> [DateSpan] -> PeriodicReportRow a MixedAmount -> [[WideBuilder]]
multiBalanceRowAsWbs bopts ReportOpts{..} colspans (PeriodicReportRow _ as rowtot rowavg) = multiBalanceRowAsWbs bopts ReportOpts{..} colspans (PeriodicReportRow _ as rowtot rowavg) =
case layout_ of case layout_ of
LayoutWide width -> [fmap (showMixedAmountB bopts{displayMaxWidth=width}) allamts] LayoutWide width -> [fmap (showMixedAmountB bopts{displayMaxWidth=width}) allamts]
@ -778,10 +778,10 @@ multiBalanceRowAsWbs bopts ReportOpts{..} colspans (PeriodicReportRow _ as rowto
m [] = [n] m [] = [n]
multiBalanceRowAsCsvText :: ReportOpts -> [DateSpan] -> PeriodicReportRow a MixedAmount -> [[T.Text]] multiBalanceRowAsCsvText :: ReportOpts -> [DateSpan] -> PeriodicReportRow a MixedAmount -> [[T.Text]]
multiBalanceRowAsCsvText opts colspans = fmap (fmap wbToText) . multiBalanceRowAsWbs csvDisplay opts colspans multiBalanceRowAsCsvText opts colspans = fmap (fmap wbToText) . multiBalanceRowAsWbs machineFmt opts colspans
multiBalanceRowAsTableText :: ReportOpts -> PeriodicReportRow a MixedAmount -> [[WideBuilder]] multiBalanceRowAsTableText :: ReportOpts -> PeriodicReportRow a MixedAmount -> [[WideBuilder]]
multiBalanceRowAsTableText opts = multiBalanceRowAsWbs oneLine{displayColour=color_ opts} opts [] multiBalanceRowAsTableText opts = multiBalanceRowAsWbs oneLineFmt{displayColour=color_ opts} opts []
tests_Balance = testGroup "Balance" [ tests_Balance = testGroup "Balance" [

2
hledger/Hledger/Cli/Commands/Prices.hs
View File

@ -89,7 +89,7 @@ showPriceDirective mp = T.unwords [
"P", "P",
T.pack . show $ pddate mp, T.pack . show $ pddate mp,
quoteCommoditySymbolIfNeeded $ pdcommodity mp, quoteCommoditySymbolIfNeeded $ pdcommodity mp,
wbToText . showAmountB noColour{displayZeroCommodity=True} $ pdamount mp wbToText . showAmountB defaultFmt{displayZeroCommodity=True} $ pdamount mp
] ]
-- | Convert a market price directive to a corresponding one in the -- | Convert a market price directive to a corresponding one in the

2
hledger/Hledger/Cli/Commands/Print.hs
View File

@ -211,7 +211,7 @@ postingToCSV p =
-- commodity goes into separate column, so we suppress it, along with digit group -- commodity goes into separate column, so we suppress it, along with digit group
-- separators and prices -- separators and prices
let a_ = amountStripCost a{acommodity=""} in let a_ = amountStripCost a{acommodity=""} in
let showamt = wbToText . showAmountB csvDisplay in let showamt = wbToText . showAmountB machineFmt in
let amt = showamt a_ in let amt = showamt a_ in
let credit = if q < 0 then showamt $ negate a_ else "" in let credit = if q < 0 then showamt $ negate a_ else "" in
let debit = if q >= 0 then showamt a_ else "" in let debit = if q >= 0 then showamt a_ else "" in

4
hledger/Hledger/Cli/Commands/Register.hs
View File

@ -113,8 +113,8 @@ postingsReportItemAsCsvRecord (_, _, _, p, b) = [idx,date,code,desc,acct,amt,bal
VirtualPosting -> wrap "(" ")" VirtualPosting -> wrap "(" ")"
_ -> id _ -> id
-- Since postingsReport strips prices from all Amounts when not used, we can display prices. -- Since postingsReport strips prices from all Amounts when not used, we can display prices.
amt = wbToText . showMixedAmountB csvDisplay $ pamount p amt = wbToText . showMixedAmountB machineFmt $ pamount p
bal = wbToText $ showMixedAmountB csvDisplay b bal = wbToText $ showMixedAmountB machineFmt b
-- | Render a register report as plain text suitable for console output. -- | Render a register report as plain text suitable for console output.
postingsReportAsText :: CliOpts -> PostingsReport -> TL.Text postingsReportAsText :: CliOpts -> PostingsReport -> TL.Text

2
hledger/Hledger/Cli/Utils.hs
View File

@ -282,7 +282,7 @@ postingsOrTransactionsReportAsText alignAll opts itemAsText itemamt itembal repo
startAlign = (if alignAll then id else take chunkSize) itemsWithAmounts startAlign = (if alignAll then id else take chunkSize) itemsWithAmounts
itemsWithAmounts = map (\x -> (x, showAmt $ itemamt x, showAmt $ itembal x)) report itemsWithAmounts = map (\x -> (x, showAmt $ itemamt x, showAmt $ itembal x)) report
showAmt = showMixedAmountLinesB oneLine{displayColour=opts^.color__} showAmt = showMixedAmountLinesB oneLineFmt{displayColour=opts^.color__}
amt = second3 amt = second3
bal = third3 bal = third3

8
hledger/test/json.test
View File

@ -16,7 +16,7 @@ $ hledger -f- reg --output-format=json
"pamount": [ "pamount": [
{ {
"acommodity": "AAA", "acommodity": "AAA",
"aprice": null, "acost": null,
"aquantity": { "aquantity": {
"decimalMantissa": 10, "decimalMantissa": 10,
"decimalPlaces": 1, "decimalPlaces": 1,
@ -45,7 +45,7 @@ $ hledger -f- reg --output-format=json
[ [
{ {
"acommodity": "AAA", "acommodity": "AAA",
"aprice": null, "acost": null,
"aquantity": { "aquantity": {
"decimalMantissa": 10, "decimalMantissa": 10,
"decimalPlaces": 1, "decimalPlaces": 1,
@ -75,7 +75,7 @@ $ hledger -f- bal --output-format=json
[ [
{ {
"acommodity": "AAA", "acommodity": "AAA",
"aprice": null, "acost": null,
"aquantity": { "aquantity": {
"decimalMantissa": 10, "decimalMantissa": 10,
"decimalPlaces": 1, "decimalPlaces": 1,
@ -96,7 +96,7 @@ $ hledger -f- bal --output-format=json
[ [
{ {
"acommodity": "AAA", "acommodity": "AAA",
"aprice": null, "acost": null,
"aquantity": { "aquantity": {
"decimalMantissa": 10, "decimalMantissa": 10,
"decimalPlaces": 1, "decimalPlaces": 1,