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

Apply --time-colon option only to time commodities

Browse source 
See #989
This commit is contained in:
Alexis Hildebrandt 2013-09-07 09:38:13 +02:00
parent 8b80e5efc7
commit 30b6acb0b0
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/amount.cc
View file

@ -196,8 +196,8 @@ namespace {
for (const char * p = buf; *p; p++) { for (const char * p = buf; *p; p++) {
if (*p == '.') { if (*p == '.') {
if (commodity_t::time_colon_by_default || if (("h" == comm->symbol() || "m" == comm->symbol()) && (commodity_t::time_colon_by_default ||
(comm && comm->has_flags(COMMODITY_STYLE_TIME_COLON))) (comm && comm->has_flags(COMMODITY_STYLE_TIME_COLON))))
out << ':'; out << ':';
else if (commodity_t::decimal_comma_by_default || else if (commodity_t::decimal_comma_by_default ||
(comm && comm->has_flags(COMMODITY_STYLE_DECIMAL_COMMA))) (comm && comm->has_flags(COMMODITY_STYLE_DECIMAL_COMMA)))
@ -213,8 +213,8 @@ namespace {
out << *p; out << *p;
if (integer_digits > 3 && --integer_digits % 3 == 0) { if (integer_digits > 3 && --integer_digits % 3 == 0) {
if (commodity_t::time_colon_by_default || if (("h" == comm->symbol() || "m" == comm->symbol()) && (commodity_t::time_colon_by_default ||
(comm && comm->has_flags(COMMODITY_STYLE_TIME_COLON))) (comm && comm->has_flags(COMMODITY_STYLE_TIME_COLON))))
out << ':'; out << ':';
else if (commodity_t::decimal_comma_by_default || else if (commodity_t::decimal_comma_by_default ||
(comm && comm->has_flags(COMMODITY_STYLE_DECIMAL_COMMA))) (comm && comm->has_flags(COMMODITY_STYLE_DECIMAL_COMMA)))
@ -744,7 +744,7 @@ void amount_t::in_place_unreduce()
} }
if (shifted) { if (shifted) {
if ("h" == comm->symbol() && commodity_t::time_colon_by_default) { if (("h" == comm->symbol() || "m" == comm->symbol()) && commodity_t::time_colon_by_default) {
amount_t floored = tmp.floored(); amount_t floored = tmp.floored();
amount_t precision = tmp - floored; amount_t precision = tmp - floored;
if (precision < 0.0) { if (precision < 0.0) {