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

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
hledger/Text/Tabular/AsciiWide.hs
View File

@ -70,7 +70,7 @@ renderColumns pretty is h = leftBar pretty ++ coreLine ++ rightBar pretty
coreLine = concatMap helper $ flattenHeader $ zipHeader 0 is h coreLine = concatMap helper $ flattenHeader $ zipHeader 0 is h
helper = either hsep (uncurry padLeftWide) helper = either hsep (uncurry padLeftWide)
hsep :: Properties -> String hsep :: Properties -> String
hsep NoLine = " " hsep NoLine = " "
hsep SingleLine = midBar pretty hsep SingleLine = midBar pretty
hsep DoubleLine = doubleMidBar pretty hsep DoubleLine = doubleMidBar pretty
@ -98,7 +98,7 @@ renderHLine' pretty prop is sep h = [ cross pretty, sep ] ++ coreLine ++ [sep, c
coreLine = concatMap helper $ flattenHeader $ zipHeader 0 is h coreLine = concatMap helper $ flattenHeader $ zipHeader 0 is h
helper = either vsep dashes helper = either vsep dashes
dashes (i,_) = replicate i sep 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 SingleLine = sep : cross pretty : [sep]
vsep DoubleLine = sep : cross' ++ [sep] vsep DoubleLine = sep : cross' ++ [sep]
cross' = case prop of cross' = case prop of

14
tests/balance/219.test
View File

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

28
tests/balance/373-layout.test
View File

@ -38,14 +38,14 @@ hledger -f 373.journal bal -Y
>>> >>>
Balance changes in 2015: Balance changes in 2015:
|| 2015 || 2015
===========++======= ===========++======
1:2 || -1 1:2 || -1
1:2:3 || 1 1:2:3 || 1
1:2:3:4 || -1 1:2:3:4 || -1
1:2:3:4:5 || 1 1:2:3:4:5 || 1
-----------++------- -----------++------
|| 0 || 0
>>>=0 >>>=0
@ -54,11 +54,11 @@ hledger -f 373.journal bal -Y --tree
>>> >>>
Balance changes in 2015: Balance changes in 2015:
|| 2015 || 2015
===========++======= ===========++======
3 || 1 3 || 1
5 || 1 5 || 1
-----------++------- -----------++------
|| ||
>>>=0 >>>=0

10
tests/balance/depth.test
View File

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

206
tests/balance/intervals.test
View File

@ -16,11 +16,11 @@ hledger -f balance-multicol.journal balance -p 'monthly in 2013' --no-total
>>> >>>
Balance changes in 2013q1: Balance changes in 2013q1:
|| 2013/01 2013/02 2013/03 || 2013/01 2013/02 2013/03
=================++============================ =================++===========================
assets || 0 1 0 assets || 0 1 0
assets:cash || 0 1 0 assets:cash || 0 1 0
assets:checking || 0 0 1 assets:checking || 0 0 1
>>>=0 >>>=0
@ -37,11 +37,11 @@ hledger -f - balance -p 'quarterly in 2013' --empty
>>> >>>
Balance changes in 2013: Balance changes in 2013:
|| 2013q1 2013q2 2013q3 2013q4 || 2013q1 2013q2 2013q3 2013q4
===++================================= ===++================================
a || 2 0 0 0 a || 2 0 0 0
---++--------------------------------- ---++--------------------------------
|| 2 0 0 0 || 2 0 0 0
>>>=0 >>>=0
@ -51,13 +51,13 @@ hledger -f balance-multicol.journal balance -p 'monthly in 2013' --cumulative
>>> >>>
Ending balances (cumulative) in 2013q1: Ending balances (cumulative) in 2013q1:
|| 2013/01/31 2013/02/28 2013/03/31 || 2013/01/31 2013/02/28 2013/03/31
=================++===================================== =================++====================================
assets || 0 1 1 assets || 0 1 1
assets:cash || 0 1 1 assets:cash || 0 1 1
assets:checking || 0 0 1 assets:checking || 0 0 1
-----------------++------------------------------------- -----------------++------------------------------------
|| 0 2 3 || 0 2 3
>>>=0 >>>=0
@ -68,12 +68,12 @@ hledger -f balance-multicol.journal balance -p 'monthly in 2013' --cumulative no
>>> >>>
Ending balances (cumulative) in 2013q1: Ending balances (cumulative) in 2013q1:
|| 2013/01/31 2013/02/28 2013/03/31 || 2013/01/31 2013/02/28 2013/03/31
=================++===================================== =================++====================================
assets || 0 1 1 assets || 0 1 1
assets:checking || 0 0 1 assets:checking || 0 0 1
-----------------++------------------------------------- -----------------++------------------------------------
|| 0 1 2 || 0 1 2
>>>=0 >>>=0
@ -82,13 +82,13 @@ hledger -f balance-multicol.journal balance -p 'monthly in 2013' --historical
>>> >>>
Ending balances (historical) in 2013q1: Ending balances (historical) in 2013q1:
|| 2013/01/31 2013/02/28 2013/03/31 || 2013/01/31 2013/02/28 2013/03/31
=================++===================================== =================++====================================
assets || 0 1 1 assets || 0 1 1
assets:cash || 0 1 1 assets:cash || 0 1 1
assets:checking || 10 10 11 assets:checking || 10 10 11
-----------------++------------------------------------- -----------------++------------------------------------
|| 10 12 13 || 10 12 13
>>>=0 >>>=0
@ -98,12 +98,12 @@ hledger -f balance-multicol.journal balance -p 'monthly in 2013' not:assets$
>>> >>>
Balance changes in 2013q1: Balance changes in 2013q1:
|| 2013/01 2013/02 2013/03 || 2013/01 2013/02 2013/03
=================++============================ =================++===========================
assets:cash || 0 1 0 assets:cash || 0 1 0
assets:checking || 0 0 1 assets:checking || 0 0 1
-----------------++---------------------------- -----------------++---------------------------
|| 0 1 1 || 0 1 1
>>>=0 >>>=0
@ -112,12 +112,12 @@ hledger -f balance-multicol.journal balance -p 'monthly in 2013' not:assets$ --c
>>> >>>
Ending balances (cumulative) in 2013q1: Ending balances (cumulative) in 2013q1:
|| 2013/01/31 2013/02/28 2013/03/31 || 2013/01/31 2013/02/28 2013/03/31
=================++===================================== =================++====================================
assets:cash || 0 1 1 assets:cash || 0 1 1
assets:checking || 0 0 1 assets:checking || 0 0 1
-----------------++------------------------------------- -----------------++------------------------------------
|| 0 1 2 || 0 1 2
>>>=0 >>>=0
@ -126,13 +126,13 @@ hledger -f balance-multicol.journal balance -p 'monthly in 2013' --historical
>>> >>>
Ending balances (historical) in 2013q1: Ending balances (historical) in 2013q1:
|| 2013/01/31 2013/02/28 2013/03/31 || 2013/01/31 2013/02/28 2013/03/31
=================++===================================== =================++====================================
assets || 0 1 1 assets || 0 1 1
assets:cash || 0 1 1 assets:cash || 0 1 1
assets:checking || 10 10 11 assets:checking || 10 10 11
-----------------++------------------------------------- -----------------++------------------------------------
|| 10 12 13 || 10 12 13
>>>=0 >>>=0
@ -143,11 +143,11 @@ hledger -f balance-multicol.journal balance -p 'monthly in 2013' --depth 1
>>> >>>
Balance changes in 2013q1: Balance changes in 2013q1:
|| 2013/01 2013/02 2013/03 || 2013/01 2013/02 2013/03
========++============================ ========++===========================
assets || 0 2 1 assets || 0 2 1
--------++---------------------------- --------++---------------------------
|| 0 2 1 || 0 2 1
>>>=0 >>>=0
@ -156,11 +156,11 @@ hledger -f balance-multicol.journal balance -p 'monthly in 2013' --depth 1 asset
>>> >>>
Balance changes in 2013q1: Balance changes in 2013q1:
|| 2013/01 2013/02 2013/03 || 2013/01 2013/02 2013/03
========++============================ ========++===========================
assets || 0 1 1 assets || 0 1 1
--------++---------------------------- --------++---------------------------
|| 0 1 1 || 0 1 1
>>>=0 >>>=0
@ -169,11 +169,11 @@ hledger -f balance-multicol.journal balance -p 'monthly in 2013' --depth 1 --cum
>>> >>>
Ending balances (cumulative) in 2013q1: Ending balances (cumulative) in 2013q1:
|| 2013/01/31 2013/02/28 2013/03/31 || 2013/01/31 2013/02/28 2013/03/31
========++===================================== ========++====================================
assets || 0 2 3 assets || 0 2 3
--------++------------------------------------- --------++------------------------------------
|| 0 2 3 || 0 2 3
>>>=0 >>>=0
@ -182,11 +182,11 @@ hledger -f balance-multicol.journal balance -p 'monthly in 2013' --depth 1 --his
>>> >>>
Ending balances (historical) in 2013q1: Ending balances (historical) in 2013q1:
|| 2013/01/31 2013/02/28 2013/03/31 || 2013/01/31 2013/02/28 2013/03/31
========++===================================== ========++====================================
assets || 10 12 13 assets || 10 12 13
--------++------------------------------------- --------++------------------------------------
|| 10 12 13 || 10 12 13
>>>=0 >>>=0
@ -195,13 +195,13 @@ hledger -f balance-multicol.journal balance -p 'monthly in 2013' --tree
>>> >>>
Balance changes in 2013q1: Balance changes in 2013q1:
|| 2013/01 2013/02 2013/03 || 2013/01 2013/02 2013/03
============++============================ ============++===========================
assets || 0 2 1 assets || 0 2 1
cash || 0 1 0 cash || 0 1 0
checking || 0 0 1 checking || 0 0 1
------------++---------------------------- ------------++---------------------------
|| 0 2 1 || 0 2 1
>>>=0 >>>=0
@ -210,13 +210,13 @@ hledger -f balance-multicol.journal balance -p 'monthly in 2013' --cumulative --
>>> >>>
Ending balances (cumulative) in 2013q1: Ending balances (cumulative) in 2013q1:
|| 2013/01/31 2013/02/28 2013/03/31 || 2013/01/31 2013/02/28 2013/03/31
============++===================================== ============++====================================
assets || 0 2 3 assets || 0 2 3
cash || 0 1 1 cash || 0 1 1
checking || 0 0 1 checking || 0 0 1
------------++------------------------------------- ------------++------------------------------------
|| 0 2 3 || 0 2 3
>>>=0 >>>=0
@ -225,13 +225,13 @@ hledger -f balance-multicol.journal balance -p 'monthly in 2013' --historical --
>>> >>>
Ending balances (historical) in 2013q1: Ending balances (historical) in 2013q1:
|| 2013/01/31 2013/02/28 2013/03/31 || 2013/01/31 2013/02/28 2013/03/31
============++===================================== ============++====================================
assets || 10 12 13 assets || 10 12 13
cash || 0 1 1 cash || 0 1 1
checking || 10 10 11 checking || 10 10 11
------------++------------------------------------- ------------++------------------------------------
|| 10 12 13 || 10 12 13
>>>=0 >>>=0
@ -247,12 +247,12 @@ hledger -f- balance --monthly --date2
>>> >>>
Balance changes in 2014/01: Balance changes in 2014/01:
|| 2014/01 || 2014/01
===++========== ===++=========
a || 1 a || 1
b || 1 b || 1
---++---------- ---++---------
|| 2 || 2
>>>=0 >>>=0
@ -271,12 +271,12 @@ hledger -f- balance -p 'monthly 2014/1/10-2014/2/20'
>>> >>>
Balance changes in 2014/01/01-2014/02/28: Balance changes in 2014/01/01-2014/02/28:
|| 2014/01 2014/02 || 2014/01 2014/02
========++=================== ========++==================
after || 0 1 after || 0 1
before || 1 0 before || 1 0
within || 0 1 within || 0 1
--------++------------------- --------++------------------
|| 1 2 || 1 2
>>>=0 >>>=0

14
tests/balance/pretty.test
View File

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

194
tests/balancesheet/balancesheet.test
View File

@ -28,23 +28,23 @@ hledger -f sample.journal balancesheet -p 'monthly in 2008'
>>> >>>
Balance Sheet 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 || 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 ||
----------------------++------------------------------------------------------------------------------------------------------------------------------------------------- ----------------------++------------------------------------------------------------------------------------------------------------------------------------------------
assets:bank:checking || $1 $1 $1 $1 $1 $1 $1 $1 $1 $1 $1 0 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: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 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 || $1 $1 $1 $1 $1 0 0 0 0 0 0 $-1
======================++================================================================================================================================================= ======================++================================================================================================================================================
Liabilities || Liabilities ||
----------------------++------------------------------------------------------------------------------------------------------------------------------------------------- ----------------------++------------------------------------------------------------------------------------------------------------------------------------------------
liabilities:debts || 0 0 0 0 0 0 0 0 0 0 0 $1 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 || 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 Total || $1 $1 $1 $1 $1 0 0 0 0 0 0 0
>>>=0 >>>=0
@ -53,26 +53,26 @@ hledger -f sample.journal balancesheet -p 'monthly in 2008' --tree
>>> >>>
Balance Sheet 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 || 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 ||
--------------++------------------------------------------------------------------------------------------------------------------------------------------------- --------------++------------------------------------------------------------------------------------------------------------------------------------------------
assets || $1 $1 $1 $1 $1 0 0 0 0 0 0 $-1 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 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 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 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 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 || $1 $1 $1 $1 $1 0 0 0 0 0 0 $-1
==============++================================================================================================================================================= ==============++================================================================================================================================================
Liabilities || Liabilities ||
--------------++------------------------------------------------------------------------------------------------------------------------------------------------- --------------++------------------------------------------------------------------------------------------------------------------------------------------------
liabilities || 0 0 0 0 0 0 0 0 0 0 0 $1 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 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 || 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 Total || $1 $1 $1 $1 $1 0 0 0 0 0 0 0
>>>= 0 >>>= 0
@ -81,23 +81,23 @@ hledger -f sample.journal balancesheet -p 'monthly in 2008' -A
>>> >>>
Balance Sheet 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 || 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 ||
----------------------++---------------------------------------------------------------------------------------------------------------------------------------------------------- ----------------------++---------------------------------------------------------------------------------------------------------------------------------------------------------
assets:bank:checking || $1 $1 $1 $1 $1 $1 $1 $1 $1 $1 $1 0 $1 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: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 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 || $1 $1 $1 $1 $1 0 0 0 0 0 0 $-1 0
======================++========================================================================================================================================================== ======================++=========================================================================================================================================================
Liabilities || Liabilities ||
----------------------++---------------------------------------------------------------------------------------------------------------------------------------------------------- ----------------------++---------------------------------------------------------------------------------------------------------------------------------------------------------
liabilities:debts || 0 0 0 0 0 0 0 0 0 0 0 $1 0 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 || 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 Total || $1 $1 $1 $1 $1 0 0 0 0 0 0 0 0
>>>= 0 >>>= 0
@ -106,21 +106,21 @@ hledger -f sample.journal balancesheet -p 'monthly in 2008' -NT
>>> >>>
Balance Sheet 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 || 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 ||
----------------------++---------------------------------------------------------------------------------------------------------------------------------------------------------- ----------------------++---------------------------------------------------------------------------------------------------------------------------------------------------------
assets:bank:checking || $1 $1 $1 $1 $1 $1 $1 $1 $1 $1 $1 0 $11 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: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 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 || $1 $1 $1 $1 $1 0 0 0 0 0 0 $-1 $4
======================++========================================================================================================================================================== ======================++=========================================================================================================================================================
Liabilities || Liabilities ||
----------------------++---------------------------------------------------------------------------------------------------------------------------------------------------------- ----------------------++---------------------------------------------------------------------------------------------------------------------------------------------------------
liabilities:debts || 0 0 0 0 0 0 0 0 0 0 0 $1 $1 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 0 0 0 0 0 0 0 0 0 0 $1 $1
>>>= 0 >>>= 0
@ -181,20 +181,20 @@ hledger -f- balancesheet -YTA
>>> >>>
Balance Sheet Balance Sheet
|| 2017/12/31 Total Average || 2017/12/31 Total Average
=============++=============================== =============++==============================
Assets || Assets ||
-------------++------------------------------- -------------++------------------------------
assets || $1 $1 $1 assets || $1 $1 $1
-------------++------------------------------- -------------++------------------------------
|| $1 $1 $1 || $1 $1 $1
=============++=============================== =============++==============================
Liabilities || Liabilities ||
-------------++------------------------------- -------------++------------------------------
-------------++------------------------------- -------------++------------------------------
|| ||
=============++=============================== =============++==============================
Total || $1 $1 $1 Total || $1 $1 $1
>>>2 >>>2
>>>=0 >>>=0
@ -208,20 +208,20 @@ hledger -f - balancesheet -M --pretty-tables
>>> >>>
Balance Sheet Balance Sheet
║ 2016/01/31 ║ 2016/01/31
═════════════╬═════════════ ═════════════╬════════════
Assets ║ Assets ║
─────────────╫───────────── ─────────────╫────────────
assets ║ 1 assets ║ 1
─────────────╫───────────── ─────────────╫────────────
║ 1 ║ 1
═════════════╬═════════════ ═════════════╬════════════
Liabilities ║ Liabilities ║
─────────────╫───────────── ─────────────╫────────────
─────────────╫───────────── ─────────────╫────────────
║ ║
═════════════╬═════════════ ═════════════╬════════════
Total ║ 1 Total ║ 1
>>>2 >>>2
>>>= 0 >>>= 0

64
tests/cashflow/cashflow.test
View File

@ -151,15 +151,15 @@ hledger -f sample.journal cashflow -p 'monthly in 2008'
>>> >>>
Cashflow Statement 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 || 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 || Cash flows ||
----------------------++------------------------------------------------------------------------------------------------------------- ----------------------++------------------------------------------------------------------------------------------------------------
assets:bank:checking || $1 0 0 0 0 0 0 0 0 0 0 $-1 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: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 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 || $1 0 0 0 0 $-1 0 0 0 0 0 $-1
>>>= 0 >>>= 0
@ -168,15 +168,15 @@ hledger -f sample.journal cashflow -p 'monthly in 2008' -A --historical
>>> >>>
Cashflow Statement (Historical Ending Balances) 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 || 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 || Cash flows ||
----------------------++---------------------------------------------------------------------------------------------------------------------------------------------------------- ----------------------++---------------------------------------------------------------------------------------------------------------------------------------------------------
assets:bank:checking || $1 $1 $1 $1 $1 $1 $1 $1 $1 $1 $1 0 $1 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: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 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 || $1 $1 $1 $1 $1 0 0 0 0 0 0 $-1 0
>>>= 0 >>>= 0
@ -213,14 +213,14 @@ hledger -f sample.journal cf -Y
>>> >>>
Cashflow Statement Cashflow Statement
|| 2008 || 2008
====================++======= ====================++======
Cash flows || Cash flows ||
--------------------++------- --------------------++------
assets:bank:saving || $1 assets:bank:saving || $1
assets:cash || $-2 assets:cash || $-2
--------------------++------- --------------------++------
|| $-1 || $-1
>>>2 >>>2
>>>= 0 >>>= 0
@ -230,12 +230,12 @@ hledger -f sample.journal cf -Y -N
>>> >>>
Cashflow Statement Cashflow Statement
|| 2008 || 2008
====================++======= ====================++======
Cash flows || Cash flows ||
--------------------++------- --------------------++------
assets:bank:saving || $1 assets:bank:saving || $1
assets:cash || $-2 assets:cash || $-2
>>>2 >>>2
>>>= 0 >>>= 0

16
tests/i18n/wide-char-layout.test
View File

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

68
tests/incomestatement/incomestatement.test
View File

@ -195,23 +195,23 @@ hledger -f sample.journal incomestatement -p 'monthly in 2008' -AT
>>> >>>
Income Statement 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 || 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 || Revenues ||
-------------------++------------------------------------------------------------------------------------------------------------------------------- -------------------++------------------------------------------------------------------------------------------------------------------------------
income:gifts || 0 0 0 0 0 $-1 0 0 0 0 0 0 $-1 0 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 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 || $-1 0 0 0 0 $-1 0 0 0 0 0 0 $-2 0
===================++=============================================================================================================================== ===================++==============================================================================================================================
Expenses || Expenses ||
-------------------++------------------------------------------------------------------------------------------------------------------------------- -------------------++------------------------------------------------------------------------------------------------------------------------------
expenses:food || 0 0 0 0 0 $1 0 0 0 0 0 0 $1 0 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 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 || 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 Total || $-1 0 0 0 0 $1 0 0 0 0 0 0 0 0
>>>= 0 >>>= 0
@ -220,22 +220,22 @@ hledger -f sample.journal incomestatement -p 'monthly in 2008' --historical
>>> >>>
Income Statement (Historical Ending Balances) 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 || 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 || Revenues ||
-------------------++------------------------------------------------------------------------------------------------------------------------------------------------- -------------------++------------------------------------------------------------------------------------------------------------------------------------------------
income:gifts || 0 0 0 0 0 $-1 $-1 $-1 $-1 $-1 $-1 $-1 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 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 || $-1 $-1 $-1 $-1 $-1 $-2 $-2 $-2 $-2 $-2 $-2 $-2
===================++================================================================================================================================================= ===================++================================================================================================================================================
Expenses || Expenses ||
-------------------++------------------------------------------------------------------------------------------------------------------------------------------------- -------------------++------------------------------------------------------------------------------------------------------------------------------------------------
expenses:food || 0 0 0 0 0 $1 $1 $1 $1 $1 $1 $1 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 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 || 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 Total || $-1 $-1 $-1 $-1 $-1 0 0 0 0 0 0 0
>>>= 0 >>>= 0