bal/bs/cf/is: consistently separate columns with a double space

Previously, amounts wider than the column headings would be separated
by only a single space. Also there was an extra space before the first
column.
This commit is contained in:
Simon Michael 2017-07-27 08:52:49 -07:00
parent ae312d83df
commit b9571bd088
11 changed files with 310 additions and 310 deletions

View File

@ -502,7 +502,7 @@ renderBalanceReportTable (ReportOpts { pretty_tables_ = pretty, color_=usecolor
. addtrailingblank
. trimborder
. lines
. render pretty id (" " ++) showamt
. render pretty id id showamt
. align
where
addtrailingblank = (++[""])

View File

@ -98,7 +98,7 @@ renderHLine' pretty prop is sep h = [ cross pretty, sep ] ++ coreLine ++ [sep, c
coreLine = concatMap helper $ flattenHeader $ zipHeader 0 is h
helper = either vsep dashes
dashes (i,_) = replicate i sep
vsep NoLine = [sep]
vsep NoLine = replicate 2 sep -- match the double space sep in renderColumns
vsep SingleLine = sep : cross pretty : [sep]
vsep DoubleLine = sep : cross' ++ [sep]
cross' = case prop of

View File

@ -5,7 +5,7 @@ hledger -f balance-multicol.journal bal -MEH --no-total date:2013/1 --tree --fla
Ending balances (historical) in 2013/01:
|| 2013/01/31
=================++=============
=================++============
assets:checking || 10
>>>= 0
@ -16,7 +16,7 @@ hledger -f balance-multicol.journal bal -MEH --no-total date:2013/1 --flat --tre
Ending balances (historical) in 2013/01:
|| 2013/01/31
============++=============
============++============
assets || 10
checking || 10

View File

@ -39,12 +39,12 @@ hledger -f 373.journal bal -Y
Balance changes in 2015:
|| 2015
===========++=======
===========++======
1:2 || -1
1:2:3 || 1
1:2:3:4 || -1
1:2:3:4:5 || 1
-----------++-------
-----------++------
|| 0
>>>=0
@ -55,10 +55,10 @@ hledger -f 373.journal bal -Y --tree
Balance changes in 2015:
|| 2015
===========++=======
===========++======
3 || 1
5 || 1
-----------++-------
-----------++------
||
>>>=0

View File

@ -19,9 +19,9 @@ hledger -f sample.journal balance -M -e 2008/4 --depth 0
Balance changes in 2008/01:
|| 2008/01
=====++==========
=====++=========
... || 0
-----++----------
-----++---------
|| 0
>>>=0

View File

@ -17,7 +17,7 @@ hledger -f balance-multicol.journal balance -p 'monthly in 2013' --no-total
Balance changes in 2013q1:
|| 2013/01 2013/02 2013/03
=================++============================
=================++===========================
assets || 0 1 0
assets:cash || 0 1 0
assets:checking || 0 0 1
@ -38,9 +38,9 @@ hledger -f - balance -p 'quarterly in 2013' --empty
Balance changes in 2013:
|| 2013q1 2013q2 2013q3 2013q4
===++=================================
===++================================
a || 2 0 0 0
---++---------------------------------
---++--------------------------------
|| 2 0 0 0
>>>=0
@ -52,11 +52,11 @@ hledger -f balance-multicol.journal balance -p 'monthly in 2013' --cumulative
Ending balances (cumulative) in 2013q1:
|| 2013/01/31 2013/02/28 2013/03/31
=================++=====================================
=================++====================================
assets || 0 1 1
assets:cash || 0 1 1
assets:checking || 0 0 1
-----------------++-------------------------------------
-----------------++------------------------------------
|| 0 2 3
>>>=0
@ -69,10 +69,10 @@ hledger -f balance-multicol.journal balance -p 'monthly in 2013' --cumulative no
Ending balances (cumulative) in 2013q1:
|| 2013/01/31 2013/02/28 2013/03/31
=================++=====================================
=================++====================================
assets || 0 1 1
assets:checking || 0 0 1
-----------------++-------------------------------------
-----------------++------------------------------------
|| 0 1 2
>>>=0
@ -83,11 +83,11 @@ hledger -f balance-multicol.journal balance -p 'monthly in 2013' --historical
Ending balances (historical) in 2013q1:
|| 2013/01/31 2013/02/28 2013/03/31
=================++=====================================
=================++====================================
assets || 0 1 1
assets:cash || 0 1 1
assets:checking || 10 10 11
-----------------++-------------------------------------
-----------------++------------------------------------
|| 10 12 13
>>>=0
@ -99,10 +99,10 @@ hledger -f balance-multicol.journal balance -p 'monthly in 2013' not:assets$
Balance changes in 2013q1:
|| 2013/01 2013/02 2013/03
=================++============================
=================++===========================
assets:cash || 0 1 0
assets:checking || 0 0 1
-----------------++----------------------------
-----------------++---------------------------
|| 0 1 1
>>>=0
@ -113,10 +113,10 @@ hledger -f balance-multicol.journal balance -p 'monthly in 2013' not:assets$ --c
Ending balances (cumulative) in 2013q1:
|| 2013/01/31 2013/02/28 2013/03/31
=================++=====================================
=================++====================================
assets:cash || 0 1 1
assets:checking || 0 0 1
-----------------++-------------------------------------
-----------------++------------------------------------
|| 0 1 2
>>>=0
@ -127,11 +127,11 @@ hledger -f balance-multicol.journal balance -p 'monthly in 2013' --historical
Ending balances (historical) in 2013q1:
|| 2013/01/31 2013/02/28 2013/03/31
=================++=====================================
=================++====================================
assets || 0 1 1
assets:cash || 0 1 1
assets:checking || 10 10 11
-----------------++-------------------------------------
-----------------++------------------------------------
|| 10 12 13
>>>=0
@ -144,9 +144,9 @@ hledger -f balance-multicol.journal balance -p 'monthly in 2013' --depth 1
Balance changes in 2013q1:
|| 2013/01 2013/02 2013/03
========++============================
========++===========================
assets || 0 2 1
--------++----------------------------
--------++---------------------------
|| 0 2 1
>>>=0
@ -157,9 +157,9 @@ hledger -f balance-multicol.journal balance -p 'monthly in 2013' --depth 1 asset
Balance changes in 2013q1:
|| 2013/01 2013/02 2013/03
========++============================
========++===========================
assets || 0 1 1
--------++----------------------------
--------++---------------------------
|| 0 1 1
>>>=0
@ -170,9 +170,9 @@ hledger -f balance-multicol.journal balance -p 'monthly in 2013' --depth 1 --cum
Ending balances (cumulative) in 2013q1:
|| 2013/01/31 2013/02/28 2013/03/31
========++=====================================
========++====================================
assets || 0 2 3
--------++-------------------------------------
--------++------------------------------------
|| 0 2 3
>>>=0
@ -183,9 +183,9 @@ hledger -f balance-multicol.journal balance -p 'monthly in 2013' --depth 1 --his
Ending balances (historical) in 2013q1:
|| 2013/01/31 2013/02/28 2013/03/31
========++=====================================
========++====================================
assets || 10 12 13
--------++-------------------------------------
--------++------------------------------------
|| 10 12 13
>>>=0
@ -196,11 +196,11 @@ hledger -f balance-multicol.journal balance -p 'monthly in 2013' --tree
Balance changes in 2013q1:
|| 2013/01 2013/02 2013/03
============++============================
============++===========================
assets || 0 2 1
cash || 0 1 0
checking || 0 0 1
------------++----------------------------
------------++---------------------------
|| 0 2 1
>>>=0
@ -211,11 +211,11 @@ hledger -f balance-multicol.journal balance -p 'monthly in 2013' --cumulative --
Ending balances (cumulative) in 2013q1:
|| 2013/01/31 2013/02/28 2013/03/31
============++=====================================
============++====================================
assets || 0 2 3
cash || 0 1 1
checking || 0 0 1
------------++-------------------------------------
------------++------------------------------------
|| 0 2 3
>>>=0
@ -226,11 +226,11 @@ hledger -f balance-multicol.journal balance -p 'monthly in 2013' --historical --
Ending balances (historical) in 2013q1:
|| 2013/01/31 2013/02/28 2013/03/31
============++=====================================
============++====================================
assets || 10 12 13
cash || 0 1 1
checking || 10 10 11
------------++-------------------------------------
------------++------------------------------------
|| 10 12 13
>>>=0
@ -248,10 +248,10 @@ hledger -f- balance --monthly --date2
Balance changes in 2014/01:
|| 2014/01
===++==========
===++=========
a || 1
b || 1
---++----------
---++---------
|| 2
>>>=0
@ -272,11 +272,11 @@ hledger -f- balance -p 'monthly 2014/1/10-2014/2/20'
Balance changes in 2014/01/01-2014/02/28:
|| 2014/01 2014/02
========++===================
========++==================
after || 0 1
before || 1 0
within || 0 1
--------++-------------------
--------++------------------
|| 1 2
>>>=0

View File

@ -3,11 +3,11 @@ hledger -f balance-multicol.journal balance --pretty-tables -M
Balance changes in 2012/12/01-2013/03/31:
║ 2012/12 2013/01 2013/02 2013/03
═════════════════╬════════════════════════════════════
═════════════════╬════════════════════════════════════
assets ║ 0 0 1 0
assets:cash ║ 0 0 1 0
assets:checking ║ 10 0 0 1
─────────────────╫────────────────────────────────────
─────────────────╫────────────────────────────────────
║ 10 0 2 1
>>>=0

View File

@ -29,21 +29,21 @@ hledger -f sample.journal balancesheet -p 'monthly in 2008'
Balance Sheet
|| 2008/01/31 2008/02/29 2008/03/31 2008/04/30 2008/05/31 2008/06/30 2008/07/31 2008/08/31 2008/09/30 2008/10/31 2008/11/30 2008/12/31
======================++=================================================================================================================================================
======================++================================================================================================================================================
Assets ||
----------------------++-------------------------------------------------------------------------------------------------------------------------------------------------
----------------------++------------------------------------------------------------------------------------------------------------------------------------------------
assets:bank:checking || $1 $1 $1 $1 $1 $1 $1 $1 $1 $1 $1 0
assets:bank:saving || 0 0 0 0 0 $1 $1 $1 $1 $1 $1 $1
assets:cash || 0 0 0 0 0 $-2 $-2 $-2 $-2 $-2 $-2 $-2
----------------------++-------------------------------------------------------------------------------------------------------------------------------------------------
----------------------++------------------------------------------------------------------------------------------------------------------------------------------------
|| $1 $1 $1 $1 $1 0 0 0 0 0 0 $-1
======================++=================================================================================================================================================
======================++================================================================================================================================================
Liabilities ||
----------------------++-------------------------------------------------------------------------------------------------------------------------------------------------
----------------------++------------------------------------------------------------------------------------------------------------------------------------------------
liabilities:debts || 0 0 0 0 0 0 0 0 0 0 0 $1
----------------------++-------------------------------------------------------------------------------------------------------------------------------------------------
----------------------++------------------------------------------------------------------------------------------------------------------------------------------------
|| 0 0 0 0 0 0 0 0 0 0 0 $1
======================++=================================================================================================================================================
======================++================================================================================================================================================
Total || $1 $1 $1 $1 $1 0 0 0 0 0 0 0
>>>=0
@ -54,24 +54,24 @@ hledger -f sample.journal balancesheet -p 'monthly in 2008' --tree
Balance Sheet
|| 2008/01/31 2008/02/29 2008/03/31 2008/04/30 2008/05/31 2008/06/30 2008/07/31 2008/08/31 2008/09/30 2008/10/31 2008/11/30 2008/12/31
==============++=================================================================================================================================================
==============++================================================================================================================================================
Assets ||
--------------++-------------------------------------------------------------------------------------------------------------------------------------------------
--------------++------------------------------------------------------------------------------------------------------------------------------------------------
assets || $1 $1 $1 $1 $1 0 0 0 0 0 0 $-1
bank || $1 $1 $1 $1 $1 $2 $2 $2 $2 $2 $2 $1
checking || $1 $1 $1 $1 $1 $1 $1 $1 $1 $1 $1 0
saving || 0 0 0 0 0 $1 $1 $1 $1 $1 $1 $1
cash || 0 0 0 0 0 $-2 $-2 $-2 $-2 $-2 $-2 $-2
--------------++-------------------------------------------------------------------------------------------------------------------------------------------------
--------------++------------------------------------------------------------------------------------------------------------------------------------------------
|| $1 $1 $1 $1 $1 0 0 0 0 0 0 $-1
==============++=================================================================================================================================================
==============++================================================================================================================================================
Liabilities ||
--------------++-------------------------------------------------------------------------------------------------------------------------------------------------
--------------++------------------------------------------------------------------------------------------------------------------------------------------------
liabilities || 0 0 0 0 0 0 0 0 0 0 0 $1
debts || 0 0 0 0 0 0 0 0 0 0 0 $1
--------------++-------------------------------------------------------------------------------------------------------------------------------------------------
--------------++------------------------------------------------------------------------------------------------------------------------------------------------
|| 0 0 0 0 0 0 0 0 0 0 0 $1
==============++=================================================================================================================================================
==============++================================================================================================================================================
Total || $1 $1 $1 $1 $1 0 0 0 0 0 0 0
>>>= 0
@ -82,21 +82,21 @@ hledger -f sample.journal balancesheet -p 'monthly in 2008' -A
Balance Sheet
|| 2008/01/31 2008/02/29 2008/03/31 2008/04/30 2008/05/31 2008/06/30 2008/07/31 2008/08/31 2008/09/30 2008/10/31 2008/11/30 2008/12/31 Average
======================++==========================================================================================================================================================
======================++=========================================================================================================================================================
Assets ||
----------------------++----------------------------------------------------------------------------------------------------------------------------------------------------------
----------------------++---------------------------------------------------------------------------------------------------------------------------------------------------------
assets:bank:checking || $1 $1 $1 $1 $1 $1 $1 $1 $1 $1 $1 0 $1
assets:bank:saving || 0 0 0 0 0 $1 $1 $1 $1 $1 $1 $1 $1
assets:cash || 0 0 0 0 0 $-2 $-2 $-2 $-2 $-2 $-2 $-2 $-1
----------------------++----------------------------------------------------------------------------------------------------------------------------------------------------------
----------------------++---------------------------------------------------------------------------------------------------------------------------------------------------------
|| $1 $1 $1 $1 $1 0 0 0 0 0 0 $-1 0
======================++==========================================================================================================================================================
======================++=========================================================================================================================================================
Liabilities ||
----------------------++----------------------------------------------------------------------------------------------------------------------------------------------------------
----------------------++---------------------------------------------------------------------------------------------------------------------------------------------------------
liabilities:debts || 0 0 0 0 0 0 0 0 0 0 0 $1 0
----------------------++----------------------------------------------------------------------------------------------------------------------------------------------------------
----------------------++---------------------------------------------------------------------------------------------------------------------------------------------------------
|| 0 0 0 0 0 0 0 0 0 0 0 $1 0
======================++==========================================================================================================================================================
======================++=========================================================================================================================================================
Total || $1 $1 $1 $1 $1 0 0 0 0 0 0 0 0
>>>= 0
@ -107,19 +107,19 @@ hledger -f sample.journal balancesheet -p 'monthly in 2008' -NT
Balance Sheet
|| 2008/01/31 2008/02/29 2008/03/31 2008/04/30 2008/05/31 2008/06/30 2008/07/31 2008/08/31 2008/09/30 2008/10/31 2008/11/30 2008/12/31 Total
======================++==========================================================================================================================================================
======================++=========================================================================================================================================================
Assets ||
----------------------++----------------------------------------------------------------------------------------------------------------------------------------------------------
----------------------++---------------------------------------------------------------------------------------------------------------------------------------------------------
assets:bank:checking || $1 $1 $1 $1 $1 $1 $1 $1 $1 $1 $1 0 $11
assets:bank:saving || 0 0 0 0 0 $1 $1 $1 $1 $1 $1 $1 $7
assets:cash || 0 0 0 0 0 $-2 $-2 $-2 $-2 $-2 $-2 $-2 $-14
----------------------++----------------------------------------------------------------------------------------------------------------------------------------------------------
----------------------++---------------------------------------------------------------------------------------------------------------------------------------------------------
|| $1 $1 $1 $1 $1 0 0 0 0 0 0 $-1 $4
======================++==========================================================================================================================================================
======================++=========================================================================================================================================================
Liabilities ||
----------------------++----------------------------------------------------------------------------------------------------------------------------------------------------------
----------------------++---------------------------------------------------------------------------------------------------------------------------------------------------------
liabilities:debts || 0 0 0 0 0 0 0 0 0 0 0 $1 $1
----------------------++----------------------------------------------------------------------------------------------------------------------------------------------------------
----------------------++---------------------------------------------------------------------------------------------------------------------------------------------------------
|| 0 0 0 0 0 0 0 0 0 0 0 $1 $1
>>>= 0
@ -182,18 +182,18 @@ hledger -f- balancesheet -YTA
Balance Sheet
|| 2017/12/31 Total Average
=============++===============================
=============++==============================
Assets ||
-------------++-------------------------------
-------------++------------------------------
assets || $1 $1 $1
-------------++-------------------------------
-------------++------------------------------
|| $1 $1 $1
=============++===============================
=============++==============================
Liabilities ||
-------------++-------------------------------
-------------++-------------------------------
-------------++------------------------------
-------------++------------------------------
||
=============++===============================
=============++==============================
Total || $1 $1 $1
>>>2
@ -209,18 +209,18 @@ hledger -f - balancesheet -M --pretty-tables
Balance Sheet
║ 2016/01/31
═════════════╬════════════
═════════════╬════════════
Assets ║
─────────────╫────────────
─────────────╫────────────
assets ║ 1
─────────────╫────────────
─────────────╫────────────
║ 1
═════════════╬════════════
═════════════╬════════════
Liabilities ║
─────────────╫────────────
─────────────╫────────────
─────────────╫────────────
─────────────╫────────────
═════════════╬════════════
═════════════╬════════════
Total ║ 1
>>>2

View File

@ -152,13 +152,13 @@ hledger -f sample.journal cashflow -p 'monthly in 2008'
Cashflow Statement
|| 2008/01 2008/02 2008/03 2008/04 2008/05 2008/06 2008/07 2008/08 2008/09 2008/10 2008/11 2008/12
======================++=============================================================================================================
======================++============================================================================================================
Cash flows ||
----------------------++-------------------------------------------------------------------------------------------------------------
----------------------++------------------------------------------------------------------------------------------------------------
assets:bank:checking || $1 0 0 0 0 0 0 0 0 0 0 $-1
assets:bank:saving || 0 0 0 0 0 $1 0 0 0 0 0 0
assets:cash || 0 0 0 0 0 $-2 0 0 0 0 0 0
----------------------++-------------------------------------------------------------------------------------------------------------
----------------------++------------------------------------------------------------------------------------------------------------
|| $1 0 0 0 0 $-1 0 0 0 0 0 $-1
>>>= 0
@ -169,13 +169,13 @@ hledger -f sample.journal cashflow -p 'monthly in 2008' -A --historical
Cashflow Statement (Historical Ending Balances)
|| 2008/01/31 2008/02/29 2008/03/31 2008/04/30 2008/05/31 2008/06/30 2008/07/31 2008/08/31 2008/09/30 2008/10/31 2008/11/30 2008/12/31 Average
======================++==========================================================================================================================================================
======================++=========================================================================================================================================================
Cash flows ||
----------------------++----------------------------------------------------------------------------------------------------------------------------------------------------------
----------------------++---------------------------------------------------------------------------------------------------------------------------------------------------------
assets:bank:checking || $1 $1 $1 $1 $1 $1 $1 $1 $1 $1 $1 0 $1
assets:bank:saving || 0 0 0 0 0 $1 $1 $1 $1 $1 $1 $1 $1
assets:cash || 0 0 0 0 0 $-2 $-2 $-2 $-2 $-2 $-2 $-2 $-1
----------------------++----------------------------------------------------------------------------------------------------------------------------------------------------------
----------------------++---------------------------------------------------------------------------------------------------------------------------------------------------------
|| $1 $1 $1 $1 $1 0 0 0 0 0 0 $-1 0
>>>= 0
@ -214,12 +214,12 @@ hledger -f sample.journal cf -Y
Cashflow Statement
|| 2008
====================++=======
====================++======
Cash flows ||
--------------------++-------
--------------------++------
assets:bank:saving || $1
assets:cash || $-2
--------------------++-------
--------------------++------
|| $-1
>>>2
@ -231,9 +231,9 @@ hledger -f sample.journal cf -Y -N
Cashflow Statement
|| 2008
====================++=======
====================++======
Cash flows ||
--------------------++-------
--------------------++------
assets:bank:saving || $1
assets:cash || $-2

View File

@ -64,12 +64,12 @@ hledger -f chinese.journal balance -Y
Balance changes in 2014:
|| 2014
================++=======
================++======
㐀:㐁 || -1
㐀:㐁:㐂 || 1
㐀:㐁:㐂:㐃 || -1
㐀:㐁:㐂:㐃:㐄 || 1
----------------++-------
----------------++------
|| 0
>>>2

View File

@ -196,21 +196,21 @@ hledger -f sample.journal incomestatement -p 'monthly in 2008' -AT
Income Statement
|| 2008/01 2008/02 2008/03 2008/04 2008/05 2008/06 2008/07 2008/08 2008/09 2008/10 2008/11 2008/12 Total Average
===================++===============================================================================================================================
===================++==============================================================================================================================
Revenues ||
-------------------++-------------------------------------------------------------------------------------------------------------------------------
-------------------++------------------------------------------------------------------------------------------------------------------------------
income:gifts || 0 0 0 0 0 $-1 0 0 0 0 0 0 $-1 0
income:salary || $-1 0 0 0 0 0 0 0 0 0 0 0 $-1 0
-------------------++-------------------------------------------------------------------------------------------------------------------------------
-------------------++------------------------------------------------------------------------------------------------------------------------------
|| $-1 0 0 0 0 $-1 0 0 0 0 0 0 $-2 0
===================++===============================================================================================================================
===================++==============================================================================================================================
Expenses ||
-------------------++-------------------------------------------------------------------------------------------------------------------------------
-------------------++------------------------------------------------------------------------------------------------------------------------------
expenses:food || 0 0 0 0 0 $1 0 0 0 0 0 0 $1 0
expenses:supplies || 0 0 0 0 0 $1 0 0 0 0 0 0 $1 0
-------------------++-------------------------------------------------------------------------------------------------------------------------------
-------------------++------------------------------------------------------------------------------------------------------------------------------
|| 0 0 0 0 0 $2 0 0 0 0 0 0 $2 0
===================++===============================================================================================================================
===================++==============================================================================================================================
Total || $-1 0 0 0 0 $1 0 0 0 0 0 0 0 0
>>>= 0
@ -221,21 +221,21 @@ hledger -f sample.journal incomestatement -p 'monthly in 2008' --historical
Income Statement (Historical Ending Balances)
|| 2008/01/31 2008/02/29 2008/03/31 2008/04/30 2008/05/31 2008/06/30 2008/07/31 2008/08/31 2008/09/30 2008/10/31 2008/11/30 2008/12/31
===================++=================================================================================================================================================
===================++================================================================================================================================================
Revenues ||
-------------------++-------------------------------------------------------------------------------------------------------------------------------------------------
-------------------++------------------------------------------------------------------------------------------------------------------------------------------------
income:gifts || 0 0 0 0 0 $-1 $-1 $-1 $-1 $-1 $-1 $-1
income:salary || $-1 $-1 $-1 $-1 $-1 $-1 $-1 $-1 $-1 $-1 $-1 $-1
-------------------++-------------------------------------------------------------------------------------------------------------------------------------------------
-------------------++------------------------------------------------------------------------------------------------------------------------------------------------
|| $-1 $-1 $-1 $-1 $-1 $-2 $-2 $-2 $-2 $-2 $-2 $-2
===================++=================================================================================================================================================
===================++================================================================================================================================================
Expenses ||
-------------------++-------------------------------------------------------------------------------------------------------------------------------------------------
-------------------++------------------------------------------------------------------------------------------------------------------------------------------------
expenses:food || 0 0 0 0 0 $1 $1 $1 $1 $1 $1 $1
expenses:supplies || 0 0 0 0 0 $1 $1 $1 $1 $1 $1 $1
-------------------++-------------------------------------------------------------------------------------------------------------------------------------------------
-------------------++------------------------------------------------------------------------------------------------------------------------------------------------
|| 0 0 0 0 0 $2 $2 $2 $2 $2 $2 $2
===================++=================================================================================================================================================
===================++================================================================================================================================================
Total || $-1 $-1 $-1 $-1 $-1 0 0 0 0 0 0 0
>>>= 0