1 files changed, 41 insertions, 5 deletions

diff --git a/src/amount.cc b/src/amount.cc
index 6ecb3558..ee03827e 100644
--- a/src/amount.cc
+++ b/src/amount.cc
@@ -195,7 +195,10 @@ namespace {
 
         for (const char * p = buf; *p; p++) {
           if (*p == '.') {
-            if (commodity_t::decimal_comma_by_default ||
+            if (commodity_t::time_colon_by_default ||
+                (comm && comm->has_flags(COMMODITY_STYLE_TIME_COLON)))
+              out << ':';
+            else if (commodity_t::decimal_comma_by_default ||
                 (comm && comm->has_flags(COMMODITY_STYLE_DECIMAL_COMMA)))
               out << ',';
             else
@@ -209,7 +212,10 @@ namespace {
             out << *p;
 
             if (integer_digits > 3 && --integer_digits % 3 == 0) {
-              if (commodity_t::decimal_comma_by_default ||
+              if (commodity_t::time_colon_by_default ||
+                  (comm && comm->has_flags(COMMODITY_STYLE_TIME_COLON)))
+                out << ':';
+              else if (commodity_t::decimal_comma_by_default ||
                   (comm && comm->has_flags(COMMODITY_STYLE_DECIMAL_COMMA)))
                 out << '.';
               else
@@ -670,10 +676,27 @@ void amount_t::in_place_floor()
 
   _dup();
 
-  std::ostringstream out;
-  stream_out_mpq(out, MP(quantity), precision_t(0), -1, GMP_RNDZ);
+  mpz_t quot;
+  mpz_init(quot);
+  mpz_fdiv_q(quot,  mpq_numref(MP(quantity)), mpq_denref(MP(quantity)));
+  mpq_clear(MP(quantity));
+  mpq_init(MP(quantity));
+  mpq_set_num(MP(quantity), quot);
+}
+
+void amount_t::in_place_ceiling()
+{
+  if (! quantity)
+    throw_(amount_error, _("Cannot ceiling an uninitialized amount"));
 
-  mpq_set_str(MP(quantity), out.str().c_str(), 10);
+  _dup();
+
+  mpz_t quot;
+  mpz_init(quot);
+  mpz_cdiv_q(quot,  mpq_numref(MP(quantity)), mpq_denref(MP(quantity)));
+  mpq_clear(MP(quantity));
+  mpq_init(MP(quantity));
+  mpq_set_num(MP(quantity), quot);
 }
 
 void amount_t::in_place_unround()
@@ -720,6 +743,16 @@ void amount_t::in_place_unreduce()
   }
 
   if (shifted) {
+    if ("h" == comm->symbol() && commodity_t::time_colon_by_default) {
+      amount_t floored = tmp.floored();
+      amount_t precision = tmp - floored;
+      if (precision < 0.0) {
+        precision += 1.0;
+        floored -= 1.0;
+      }
+      tmp = floored + (precision * (comm->smaller()->number() / 100.0));
+    }
+
     *this      = tmp;
     commodity_ = comm;
   }
@@ -1073,6 +1106,9 @@ bool amount_t::parse(std::istream& in, const parse_flags_t& flags)
   bool decimal_comma_style
     = (commodity_t::decimal_comma_by_default ||
        commodity().has_flags(COMMODITY_STYLE_DECIMAL_COMMA));
+  bool time_colon_style
+    = (commodity_t::time_colon_by_default ||
+       commodity().has_flags(COMMODITY_STYLE_TIME_COLON));
 
   new_quantity->prec = 0;