cli: Write.Ods: also use a number cell if the total amount has a single commodity

hledger-lib/Hledger/Write/Ods.hs

@@ -33,7 +33,10 @@ data Type =
     | TypeMixedAmount
     deriving (Eq, Ord, Show)
 
-data Style = Ordinary | Head | Foot
+data Style = Body Emphasis | Head
+    deriving (Eq, Ord, Show)
+
+data Emphasis = Item | Total
     deriving (Eq, Ord, Show)
 
 data Cell =
@@ -47,7 +50,7 @@ defaultCell :: Cell
 defaultCell =
     Cell {
         cellType = TypeString,
-        cellStyle = Ordinary,
+        cellStyle = Body Item,
         cellContent = T.empty
     }
 
@@ -141,8 +144,10 @@ printFods encoding tables =
 
     in  TL.unlines $ map (TL.fromStrict . T.pack) $
         fileOpen
-          (numberConfig
+          (let styles = cellStyles (foldMap (concat.snd) tables) in
-              =<< Set.toList (numberStyles (foldMap (concat.snd) tables))) ++
+           (numberConfig =<< Set.toList (Set.map snd styles))
+           ++
+           (cellConfig =<< Set.toList styles)) ++
         tableConfig (fmap fst tables) ++
         (Map.toAscList tables >>= \(name,(_,table)) ->
             tableOpen name ++
@@ -155,12 +160,17 @@ printFods encoding tables =
         fileClose
 
 
-numberStyles :: [Cell] -> Set (CommoditySymbol, AmountPrecision)
+cellStyles :: [Cell] -> Set (Emphasis, (CommoditySymbol, AmountPrecision))
-numberStyles =
+cellStyles =
     Set.fromList .
     mapMaybe (\cell ->
         case cellType cell of
-            TypeAmount amt -> Just (acommodity amt, asprecision $ astyle amt)
+            TypeAmount amt ->
+                Just
+                    (case cellStyle cell of
+                        Body emph -> emph
+                        Head -> Total,
+                     (acommodity amt, asprecision $ astyle amt))
             _ -> Nothing)
 
 numberStyleName :: (CommoditySymbol, AmountPrecision) -> String
@@ -183,25 +193,47 @@ numberConfig (comm, prec) =
     printf "    <number:text>%s%s</number:text>"
       (if T.null comm then "" else " ") comm :
     "  </number:number-style>" :
-    "  <style:style style:family='table-cell'" :
-    printf "    style:name='%s' style:data-style-name='number-%s'/>" name name :
     []
 
+emphasisName :: Emphasis -> String
+emphasisName emph =
+    case emph of
+        Item -> "item"
+        Total -> "total"
+
+cellConfig :: (Emphasis, (CommoditySymbol, AmountPrecision)) -> [String]
+cellConfig (emph, numParam) =
+    let name = numberStyleName numParam in
+    let style :: String
+        style =
+            printf "style:name='%s-%s' style:data-style-name='number-%s'"
+                (emphasisName emph) name name in
+    case emph of
+        Item ->
+            printf "  <style:style style:family='table-cell' %s/>" style :
+            []
+        Total ->
+            printf "  <style:style style:family='table-cell' %s>" style :
+            "    <style:text-properties fo:font-weight='bold'/>" :
+            "  </style:style>" :
+            []
+
 
 formatCell :: Cell -> [String]
 formatCell cell =
     let style, valueType :: String
         style =
           case (cellStyle cell, cellType cell) of
-            (Ordinary, TypeString) -> ""
+            (Body emph, TypeAmount amt) -> numberStyle emph amt
-            (Ordinary, TypeMixedAmount) -> " table:style-name='amount'"
+            (Body Item, TypeString) -> ""
-            (Ordinary, TypeAmount amt) -> numberStyle amt
+            (Body Item, TypeMixedAmount) -> " table:style-name='amount'"
-            (Foot, TypeString) -> " table:style-name='foot'"
+            (Body Total, TypeString) -> " table:style-name='foot'"
-            (Foot, _) -> " table:style-name='total-amount'"
+            (Body Total, TypeMixedAmount) -> " table:style-name='total-amount'"
             (Head, _) -> " table:style-name='head'"
 
-        numberStyle amt =
+        numberStyle emph amt =
-            printf " table:style-name='%s'"
+            printf " table:style-name='%s-%s'"
+                (emphasisName emph)
                 (numberStyleName (acommodity amt, asprecision $ astyle amt))
         valueType =
             case cellType cell of

hledger/Hledger/Cli/Commands/Balance.hs

@@ -565,7 +565,7 @@ balanceReportAsFods opts (items, total) =
     headers :
     concatMap (\(a, _, _, b) -> rows a b) items ++
     if no_total_ opts then []
-      else map (map (\c -> c {Ods.cellStyle = Ods.Foot})) $
+      else map (map (\c -> c {Ods.cellStyle = Ods.Body Ods.Total})) $
             rows totalRowHeadingCsv total
   where
     cell content = Ods.defaultCell { Ods.cellContent = content }