table-layout bump

1 files changed, 4 insertions, 2 deletions

diff --git a/src/Main.hs b/src/Main.hs
index 605d66d..2d9f876 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -142,7 +142,8 @@ stateOutline = do
               toDesc x
             factionIndex id = fromJust $ elemIndex (view faction' $ faction id) factions
           colsAllG top . ([maybe "" show $ view seqVal seq] :) <$> mapM factionColumn [0..(length factions - 1)]
-      layoutTableToString <$> rowGs <*> pure (Just (roundStr round : factions, repeat def)) <*> pure (repeat def) <*> pure unicodeBoldHeaderS
+      -- layoutTableToString <$> rowGs <*> pure (Just (roundStr round : factions, repeat def)) <*> pure (repeat def) <*> pure unicodeBoldHeaderS
+      tableString <$> pure (repeat def) <*> pure unicodeBoldHeaderS <*> pure (titlesH $ roundStr round : factions) <*> rowGs
 
 focusNotes :: GameState -> String
 focusNotes st
@@ -431,7 +432,8 @@ dumpLog :: Sh GameState ()
 dumpLog = use gLog >>= mapMOf (each . _1) toName >>= shellPutStrLn . toTable
   where
     toTable :: Seq (String, String) -> String
-    toTable (map (rowG . toListOf both) . toList -> table) = layoutTableToString table (Just (["Entity", "String"], [def, def])) [def, def] unicodeBoldHeaderS
+    -- toTable (map (rowG . toListOf both) . toList -> table) = layoutTableToString table (Just (["Entity", "String"], [def, def])) [def, def] unicodeBoldHeaderS
+    toTable (map (rowG . toListOf both) . toList -> table) = tableString [def, def] unicodeBoldHeaderS (titlesH ["Entity", "String"]) table
 
 printVal :: Completable (Formula Stats) -> Sh GameState ()
 printVal = withArg $ \formula -> withFocus $ \focusId -> do