sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Column widths are always calculated now

Browse source
This commit is contained in:
John Wiegley 2009-11-07 05:15:43 -05:00
parent 3f00f8362c
commit 832e53f300
3 changed files with 11 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/global.cc
View file

@ -538,6 +538,8 @@ void global_scope_t::normalize_report_options(const string& verb)
cols = rep.HANDLER(columns_).value.to_long(); cols = rep.HANDLER(columns_).value.to_long();
else if (const char * columns = std::getenv("COLUMNS")) else if (const char * columns = std::getenv("COLUMNS"))
cols = lexical_cast<long>(columns); cols = lexical_cast<long>(columns);
else
cols = 80L;
if (cols > 0) { if (cols > 0) {
DEBUG("auto.columns", "cols = " << cols); DEBUG("auto.columns", "cols = " << cols);

36
src/report.h
View file

@ -869,16 +869,7 @@ public:
}); });
OPTION_(report_t, wide, DO() { // -w OPTION_(report_t, wide, DO() { // -w
parent->HANDLER(date_width_).on_with(string("--wide"), 9L); parent->HANDLER(columns_).on_with(string("--wide"), 132L);
parent->HANDLER(date_width_).specified = true;
parent->HANDLER(payee_width_).on_with(string("--wide"), 35L);
parent->HANDLER(payee_width_).specified = true;
parent->HANDLER(account_width_).on_with(string("--wide"), 39L);
parent->HANDLER(account_width_).specified = true;
parent->HANDLER(amount_width_).on_with(string("--wide"), 22L);
parent->HANDLER(amount_width_).specified = true;
parent->HANDLER(total_width_).on_with(string("--wide"), 22L);
parent->HANDLER(total_width_).specified = true;
}); });
OPTION_(report_t, yearly, DO() { // -Y OPTION_(report_t, yearly, DO() { // -Y
@ -887,38 +878,23 @@ public:
OPTION__(report_t, date_width_, OPTION__(report_t, date_width_,
bool specified; bool specified;
CTOR(report_t, date_width_) { CTOR(report_t, date_width_) { specified = false; }
on_with(none, 9L);
specified = false;
}
DO_(args) { value = args[1].to_long(); specified = true; }); DO_(args) { value = args[1].to_long(); specified = true; });
OPTION__(report_t, payee_width_, OPTION__(report_t, payee_width_,
bool specified; bool specified;
CTOR(report_t, payee_width_) { CTOR(report_t, payee_width_) { specified = false; }
on_with(none, 20L);
specified = false;
}
DO_(args) { value = args[1].to_long(); specified = true; }); DO_(args) { value = args[1].to_long(); specified = true; });
OPTION__(report_t, account_width_, OPTION__(report_t, account_width_,
bool specified; bool specified;
CTOR(report_t, account_width_) { CTOR(report_t, account_width_) { specified = false; }
on_with(none, 23L);
specified = false;
}
DO_(args) { value = args[1].to_long(); specified = true; }); DO_(args) { value = args[1].to_long(); specified = true; });
OPTION__(report_t, amount_width_, OPTION__(report_t, amount_width_,
bool specified; bool specified;
CTOR(report_t, amount_width_) { CTOR(report_t, amount_width_) { specified = false; }
on_with(none, 12L);
specified = false;
}
DO_(args) { value = args[1].to_long(); specified = true; }); DO_(args) { value = args[1].to_long(); specified = true; });
OPTION__(report_t, total_width_, OPTION__(report_t, total_width_,
bool specified; bool specified;
CTOR(report_t, total_width_) { CTOR(report_t, total_width_) { specified = false; }
on_with(none, 12L);
specified = false;
}
DO_(args) { value = args[1].to_long(); specified = true; }); DO_(args) { value = args[1].to_long(); specified = true; });
}; };

6
test/baseline/opt-wide.test
View file

@ -4,8 +4,8 @@ reg --wide
Assets:Investments:Vanguard:VMMXX 0.350 VMMXX @ $1.00 Assets:Investments:Vanguard:VMMXX 0.350 VMMXX @ $1.00
Income:Dividends:Vanguard:VMMXX $-0.35 Income:Dividends:Vanguard:VMMXX $-0.35
>>>1 >>>1
07-Feb-02 RD VMMXX Assets:Investments:Vanguard:VMMXX 0.350 VMMXX 0.350 VMMXX 07-Feb-02 RD VMMXX Assets:Investments:Vanguard:VMMXX 0.350 VMMXX 0.350 VMMXX
Income:Dividends:Vanguard:VMMXX $-0.35 $-0.35 Income:Dividends:Vanguard:VMMXX $-0.35 $-0.35
0.350 VMMXX 0.350 VMMXX
>>>2 >>>2
=== 0 === 0