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

Changed the "truncate" valexpr func to "truncated"

Browse source
This commit is contained in:
John Wiegley 2009-02-27 02:59:16 -04:00
parent e1eb12a6e4
commit c57c85c92f
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/report.cc
View file

@ -203,7 +203,7 @@ value_t report_t::fn_quantity(call_scope_t& scope)
return args.get<amount_t>(0).number(); return args.get<amount_t>(0).number();
} }
value_t report_t::fn_truncate(call_scope_t& scope) value_t report_t::fn_truncated(call_scope_t& scope)
{ {
interactive_t args(scope, "v&ll"); interactive_t args(scope, "v&ll");
return string_value(format_t::truncate return string_value(format_t::truncate
@ -740,8 +740,8 @@ expr_t::ptr_op_t report_t::lookup(const string& name)
break; break;
case 't': case 't':
if (is_eq(p, "truncate")) if (is_eq(p, "truncated"))
return MAKE_FUNCTOR(report_t::fn_truncate); return MAKE_FUNCTOR(report_t::fn_truncated);
else if (is_eq(p, "total_expr")) else if (is_eq(p, "total_expr"))
return MAKE_FUNCTOR(report_t::fn_total_expr); return MAKE_FUNCTOR(report_t::fn_total_expr);
break; break;

8
src/report.h
View file

@ -139,7 +139,7 @@ public:
value_t fn_scrub(call_scope_t& scope); value_t fn_scrub(call_scope_t& scope);
value_t fn_quantity(call_scope_t& scope); value_t fn_quantity(call_scope_t& scope);
value_t fn_rounded(call_scope_t& scope); value_t fn_rounded(call_scope_t& scope);
value_t fn_truncate(call_scope_t& scope); value_t fn_truncated(call_scope_t& scope);
value_t fn_justify(call_scope_t& scope); value_t fn_justify(call_scope_t& scope);
value_t fn_quoted(call_scope_t& scope); value_t fn_quoted(call_scope_t& scope);
value_t fn_join(call_scope_t& scope); value_t fn_join(call_scope_t& scope);
@ -541,9 +541,9 @@ public:
OPTION__(report_t, register_format_, CTOR(report_t, register_format_) { OPTION__(report_t, register_format_, CTOR(report_t, register_format_) {
on("%(ansify_if(justify(date, date_width), \"green\", color & date > today))" on("%(ansify_if(justify(date, date_width), \"green\", color & date > today))"
" %(ansify_if(justify(truncate(payee, payee_width), payee_width), " " %(ansify_if(justify(truncated(payee, payee_width), payee_width), "
" \"bold\", color & !cleared))" " \"bold\", color & !cleared))"
" %(ansify_if(justify(truncate(account, account_width, abbrev_len), " " %(ansify_if(justify(truncated(account, account_width, abbrev_len), "
" account_width), \"blue\", color))" " account_width), \"blue\", color))"
" %(ansify_if(justify(scrub(display_amount), amount_width, " " %(ansify_if(justify(scrub(display_amount), amount_width, "
" 3 + date_width + payee_width + account_width + amount_width, true), " " 3 + date_width + payee_width + account_width + amount_width, true), "
@ -552,7 +552,7 @@ public:
" 4 + date_width + payee_width + account_width + amount_width " " 4 + date_width + payee_width + account_width + amount_width "
" + total_width, true), \"red\", color & scrub(display_amount) < 0))\n%/" " + total_width, true), \"red\", color & scrub(display_amount) < 0))\n%/"
"%(justify(\" \", 2 + date_width + payee_width))" "%(justify(\" \", 2 + date_width + payee_width))"
"%(ansify_if(justify(truncate(account, account_width, abbrev_len), " "%(ansify_if(justify(truncated(account, account_width, abbrev_len), "
" account_width), \"blue\", color))" " account_width), \"blue\", color))"
" %(ansify_if(justify(scrub(display_amount), amount_width, " " %(ansify_if(justify(scrub(display_amount), amount_width, "
" 3 + date_width + payee_width + account_width + amount_width, true), " " 3 + date_width + payee_width + account_width + amount_width, true), "