diff options
| author | John Wiegley <johnw@newartisans.com> | 2010-06-02 01:55:55 -0400 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2010-06-02 01:55:55 -0400 |
| commit | cda19829bd1100d6563b48ddb121f2afc1c55d95 (patch) | |
| tree | 5b6ab0d1eb7ec1b0b3eccf817678d0aa9a3feb47 /src/commodity.cc | |
| parent | 017492ef5e80003073c5d053252d4a68a44260ae (diff) | |
| parent | fb7cafa8965c89bbd66b09f827bd5989a87c983b (diff) | |
| download | fork-ledger-cda19829bd1100d6563b48ddb121f2afc1c55d95.tar.gz fork-ledger-cda19829bd1100d6563b48ddb121f2afc1c55d95.tar.bz2 fork-ledger-cda19829bd1100d6563b48ddb121f2afc1c55d95.zip | |
Merge branch 'next'
Diffstat (limited to 'src/commodity.cc')
| -rw-r--r-- | src/commodity.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/commodity.cc b/src/commodity.cc index 836a4269..1b85910f 100644 --- a/src/commodity.cc +++ b/src/commodity.cc @@ -38,7 +38,7 @@ namespace ledger { -bool commodity_t::european_by_default = false; +bool commodity_t::decimal_comma_by_default = false; void commodity_t::history_t::add_price(commodity_t& source, const datetime_t& date, @@ -454,7 +454,7 @@ void commodity_t::parse_symbol(std::istream& in, string& symbol) { // Invalid commodity characters: // SPACE, TAB, NEWLINE, RETURN - // 0-9 . , ; - + * / ^ ? : & | ! = + // 0-9 . , ; : ? ! - + * / ^ & | = // < > { } [ ] ( ) @ static int invalid_chars[256] = { @@ -663,10 +663,10 @@ void to_xml(std::ostream& out, const commodity_t& comm, push_xml x(out, "commodity", true); out << " flags=\""; - if (! (comm.has_flags(COMMODITY_STYLE_SUFFIXED))) out << 'P'; - if (comm.has_flags(COMMODITY_STYLE_SEPARATED)) out << 'S'; - if (comm.has_flags(COMMODITY_STYLE_THOUSANDS)) out << 'T'; - if (comm.has_flags(COMMODITY_STYLE_EUROPEAN)) out << 'E'; + if (! (comm.has_flags(COMMODITY_STYLE_SUFFIXED))) out << 'P'; + if (comm.has_flags(COMMODITY_STYLE_SEPARATED)) out << 'S'; + if (comm.has_flags(COMMODITY_STYLE_THOUSANDS)) out << 'T'; + if (comm.has_flags(COMMODITY_STYLE_DECIMAL_COMMA)) out << 'D'; out << '"'; x.close_attrs(); |